diff options
| author | Brian Lagunas <brianlagunas@users.noreply.github.com> | 2017-05-25 02:31:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-25 02:31:00 +0300 |
| commit | 1f000ea61c829ccc23beeeaf66f213d8497b4b9a (patch) | |
| tree | 3f75f8f132761ffd380f1a8ed53cfbf7ff69d2b5 | |
| parent | c4830502c8aa9b49e34749084e3423419385eb69 (diff) | |
| parent | 4f6e8a98e950894d5b034c8d77892eed93f36c39 (diff) | |
Merge pull request #1057 from dansiegel/task/netstandard
NetStandard Support & CI Integration
78 files changed, 1166 insertions, 2666 deletions
diff --git a/Sandbox/Windows10/HelloWorld/Directory.Build.props b/Sandbox/Windows10/HelloWorld/Directory.Build.props new file mode 100644 index 0000000..79eade5 --- /dev/null +++ b/Sandbox/Windows10/HelloWorld/Directory.Build.props @@ -0,0 +1,4 @@ +<Project> + <!-- Workaround for https://github.com/dotnet/sdk/pull/908 --> + <Target Name="GetPackagingOutputs" /> +</Project>
\ No newline at end of file diff --git a/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/HelloWorld.Unity.csproj b/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/HelloWorld.Unity.csproj index 91043d0..596e713 100644 --- a/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/HelloWorld.Unity.csproj +++ b/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/HelloWorld.Unity.csproj @@ -18,6 +18,7 @@ <FileAlignment>512</FileAlignment> <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <PackageCertificateKeyFile>HelloWorld.Unity_TemporaryKey.pfx</PackageCertificateKeyFile> + <PackageCertificateThumbprint>6ADB7C2299108ADE42CA9005AEF0D6CFA6771761</PackageCertificateThumbprint> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'"> <DebugSymbols>true</DebugSymbols> diff --git a/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/HelloWorld.Unity_TemporaryKey.pfx b/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/HelloWorld.Unity_TemporaryKey.pfx Binary files differindex 62a5b62..f9b6f8a 100644 --- a/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/HelloWorld.Unity_TemporaryKey.pfx +++ b/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/HelloWorld.Unity_TemporaryKey.pfx diff --git a/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/Package.appxmanifest b/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/Package.appxmanifest index 09b8947..edb8959 100644 --- a/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/Package.appxmanifest +++ b/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/Package.appxmanifest @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> - <Identity Name="ba1314fa-2272-4d8b-b46c-82b62aaf1123" Publisher="CN=bartl" Version="1.0.0.0" /> + <Identity Name="ba1314fa-2272-4d8b-b46c-82b62aaf1123" Publisher="CN=BLagunas" Version="1.0.0.0" /> <mp:PhoneIdentity PhoneProductId="ba1314fa-2272-4d8b-b46c-82b62aaf1123" PhonePublisherId="00000000-0000-0000-0000-000000000000" /> <Properties> <DisplayName>HelloWorld.Unity</DisplayName> - <PublisherDisplayName>bartl</PublisherDisplayName> + <PublisherDisplayName>BLagunas</PublisherDisplayName> <Logo>Assets\StoreLogo.png</Logo> </Properties> <Dependencies> diff --git a/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/project.json b/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/project.json index 32d9274..693e373 100644 --- a/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/project.json +++ b/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2" + "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3" }, "frameworks": { "uap10.0": {} diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.Droid/HelloWorld.Droid.csproj b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.Droid/HelloWorld.Droid.csproj index 01b7fbd..e4d37a3 100644 --- a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.Droid/HelloWorld.Droid.csproj +++ b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.Droid/HelloWorld.Droid.csproj @@ -20,7 +20,7 @@ <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis> <AndroidStoreUncompressedFileExtensions /> <MandroidI18n /> - <JavaMaximumHeapSize /> + <JavaMaximumHeapSize>1G</JavaMaximumHeapSize> <JavaOptions /> <TargetFrameworkVersion>v7.1</TargetFrameworkVersion> <NuGetPackageImportStamp> @@ -38,14 +38,11 @@ <AndroidLinkMode>None</AndroidLinkMode> <AndroidLinkSkip /> <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk> - <BundleAssemblies>False</BundleAssemblies> - <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi> <AndroidSupportedAbis /> <AndroidStoreUncompressedFileExtensions /> <MandroidI18n /> <JavaMaximumHeapSize>1G</JavaMaximumHeapSize> <Debugger>Xamarin</Debugger> - <AndroidEnableMultiDex>False</AndroidEnableMultiDex> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -58,10 +55,6 @@ <AndroidLinkMode>SdkOnly</AndroidLinkMode> </PropertyGroup> <ItemGroup> - <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\FormsViewGroup.dll</HintPath> - <Private>True</Private> - </Reference> <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath> <Private>True</Private> @@ -108,22 +101,6 @@ <HintPath>..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath> - <Private>True</Private> - </Reference> <Reference Include="Xamarin.GooglePlayServices.AppIndexing, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\packages\Xamarin.GooglePlayServices.AppIndexing.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.AppIndexing.dll</HintPath> <Private>True</Private> @@ -136,6 +113,21 @@ <HintPath>..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Basement.dll</HintPath> <Private>True</Private> </Reference> + <Reference Include="FormsViewGroup"> + <HintPath>..\..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\MonoAndroid10\FormsViewGroup.dll</HintPath> + </Reference> + <Reference Include="Xamarin.Forms.Core"> + <HintPath>..\..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath> + </Reference> + <Reference Include="Xamarin.Forms.Platform.Android"> + <HintPath>..\..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath> + </Reference> + <Reference Include="Xamarin.Forms.Platform"> + <HintPath>..\..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath> + </Reference> + <Reference Include="Xamarin.Forms.Xaml"> + <HintPath>..\..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="MainActivity.cs" /> @@ -181,6 +173,7 @@ </ProjectReference> <ProjectReference Include="..\HelloWorld\HelloWorld.csproj"> <Name>HelloWorld</Name> + <Project>{94318F08-2F60-4E7F-8C43-86B024BFF115}</Project> </ProjectReference> </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> @@ -190,14 +183,6 @@ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> <Error Condition="!Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" /> - <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> - </Target> - <Import Project="..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> </Target> - --> + <Import Project="..\..\packages\Xamarin.Forms.2.3.5.239-pre3\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.5.239-pre3\build\netstandard1.0\Xamarin.Forms.targets')" /> </Project>
\ No newline at end of file diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.Droid/packages.config b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.Droid/packages.config index e5f1154..beb4360 100644 --- a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.Droid/packages.config +++ b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.Droid/packages.config @@ -10,7 +10,7 @@ <package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid60" /> <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid60" /> <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" /> - <package id="Xamarin.Forms" version="2.3.3.193" targetFramework="monoandroid71" /> + <package id="Xamarin.Forms" version="2.3.5.239-pre3" targetFramework="monoandroid71" /> <package id="Xamarin.GooglePlayServices.AppIndexing" version="29.0.0.1" targetFramework="monoandroid60" /> <package id="Xamarin.GooglePlayServices.Base" version="29.0.0.1" targetFramework="monoandroid60" /> <package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.1" targetFramework="monoandroid60" /> diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.UWP/project.json b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.UWP/project.json index fcc1c25..51fdc4a 100644 --- a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.UWP/project.json +++ b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.UWP/project.json @@ -1,8 +1,8 @@ { "dependencies": { - "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0", + "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3", "Unity": "4.0.1", - "Xamarin.Forms": "2.3.3.193" + "Xamarin.Forms": "2.3.5.239-pre3" }, "frameworks": { "uap10.0": {} diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.iOS/HelloWorld.iOS.csproj b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.iOS/HelloWorld.iOS.csproj index 6660bc8..974d00f 100644 --- a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.iOS/HelloWorld.iOS.csproj +++ b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.iOS/HelloWorld.iOS.csproj @@ -117,6 +117,7 @@ </ProjectReference> <ProjectReference Include="..\HelloWorld\HelloWorld.csproj"> <Name>HelloWorld</Name> + <Project>{94318F08-2F60-4E7F-8C43-86B024BFF115}</Project> </ProjectReference> </ItemGroup> <ItemGroup> @@ -149,30 +150,20 @@ <Reference Include="System" /> <Reference Include="System.Xml" /> <Reference Include="System.Core" /> - <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath> - <Private>True</Private> + <Reference Include="Xamarin.iOS" /> + <Reference Include="Xamarin.Forms.Core"> + <HintPath>..\..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath> </Reference> - <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath> - <Private>True</Private> + <Reference Include="Xamarin.Forms.Platform"> + <HintPath>..\..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath> </Reference> - <Reference Include="Xamarin.Forms.Platform.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath> - <Private>True</Private> + <Reference Include="Xamarin.Forms.Platform.iOS"> + <HintPath>..\..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath> </Reference> - <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath> - <Private>True</Private> + <Reference Include="Xamarin.Forms.Xaml"> + <HintPath>..\..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath> </Reference> - <Reference Include="Xamarin.iOS" /> </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> - <Import Project="..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> - </Target> + <Import Project="..\..\packages\Xamarin.Forms.2.3.5.239-pre3\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.5.239-pre3\build\netstandard1.0\Xamarin.Forms.targets')" /> </Project>
\ No newline at end of file diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.iOS/packages.config b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.iOS/packages.config index 2d0fbf0..ce7433c 100644 --- a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.iOS/packages.config +++ b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.iOS/packages.config @@ -2,5 +2,5 @@ <packages> <package id="CommonServiceLocator" version="1.3" targetFramework="xamarinios1" /> <package id="Unity" version="4.0.1" targetFramework="xamarinios1" /> - <package id="Xamarin.Forms" version="2.3.3.193" targetFramework="xamarinios10" /> + <package id="Xamarin.Forms" version="2.3.5.239-pre3" targetFramework="xamarinios10" /> </packages>
\ No newline at end of file diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld/HelloWorld.csproj b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld/HelloWorld.csproj index 73ba399..2d432db 100644 --- a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld/HelloWorld.csproj +++ b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld/HelloWorld.csproj @@ -63,17 +63,14 @@ <HintPath>..\..\packages\Unity.4.0.1\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath> - <Private>True</Private> + <Reference Include="Xamarin.Forms.Core"> + <HintPath>..\..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath> </Reference> - <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath> - <Private>True</Private> + <Reference Include="Xamarin.Forms.Platform"> + <HintPath>..\..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath> </Reference> - <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath> - <Private>True</Private> + <Reference Include="Xamarin.Forms.Xaml"> + <HintPath>..\..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -116,18 +113,5 @@ </EmbeddedResource> </ItemGroup> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <Import Project="..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> - </Target> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> + <Import Project="..\..\packages\Xamarin.Forms.2.3.5.239-pre3\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.5.239-pre3\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> </Project>
\ No newline at end of file diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld/packages.config b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld/packages.config index 8df25b0..76ae51b 100644 --- a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld/packages.config +++ b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld/packages.config @@ -2,5 +2,5 @@ <packages> <package id="CommonServiceLocator" version="1.3" targetFramework="portable45-net45+win8+wp8" /> <package id="Unity" version="4.0.1" targetFramework="portable45-net45+win8+wp8" /> - <package id="Xamarin.Forms" version="2.3.3.193" targetFramework="portable45-net45+win8+wp8" /> + <package id="Xamarin.Forms" version="2.3.5.239-pre3" targetFramework="portable45-net45+win8+wp8" /> </packages>
\ No newline at end of file diff --git a/Sandbox/Xamarin/HelloWorld/ModuleA/ModuleA.csproj b/Sandbox/Xamarin/HelloWorld/ModuleA/ModuleA.csproj index abeac77..5977d04 100644 --- a/Sandbox/Xamarin/HelloWorld/ModuleA/ModuleA.csproj +++ b/Sandbox/Xamarin/HelloWorld/ModuleA/ModuleA.csproj @@ -81,17 +81,14 @@ <HintPath>..\packages\Unity.4.0.1\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath> - <Private>True</Private> + <Reference Include="Xamarin.Forms.Core"> + <HintPath>..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath> </Reference> - <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath> - <Private>True</Private> + <Reference Include="Xamarin.Forms.Platform"> + <HintPath>..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath> </Reference> - <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath> - <Private>True</Private> + <Reference Include="Xamarin.Forms.Xaml"> + <HintPath>..\packages\Xamarin.Forms.2.3.5.239-pre3\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -128,18 +125,5 @@ </EmbeddedResource> </ItemGroup> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <Import Project="..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> - </Target> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> + <Import Project="..\packages\Xamarin.Forms.2.3.5.239-pre3\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.5.239-pre3\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> </Project>
\ No newline at end of file diff --git a/Sandbox/Xamarin/HelloWorld/ModuleA/packages.config b/Sandbox/Xamarin/HelloWorld/ModuleA/packages.config index 8df25b0..76ae51b 100644 --- a/Sandbox/Xamarin/HelloWorld/ModuleA/packages.config +++ b/Sandbox/Xamarin/HelloWorld/ModuleA/packages.config @@ -2,5 +2,5 @@ <packages> <package id="CommonServiceLocator" version="1.3" targetFramework="portable45-net45+win8+wp8" /> <package id="Unity" version="4.0.1" targetFramework="portable45-net45+win8+wp8" /> - <package id="Xamarin.Forms" version="2.3.3.193" targetFramework="portable45-net45+win8+wp8" /> + <package id="Xamarin.Forms" version="2.3.5.239-pre3" targetFramework="portable45-net45+win8+wp8" /> </packages>
\ No newline at end of file diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props new file mode 100644 index 0000000..79eade5 --- /dev/null +++ b/Source/Directory.Build.props @@ -0,0 +1,4 @@ +<Project> + <!-- Workaround for https://github.com/dotnet/sdk/pull/908 --> + <Target Name="GetPackagingOutputs" /> +</Project>
\ No newline at end of file diff --git a/Source/Prism.Tests/Mvvm/ViewModelLocationProviderFixture.cs b/Source/Prism.Tests/Mvvm/ViewModelLocationProviderFixture.cs index 8ecc7c0..2398480 100644 --- a/Source/Prism.Tests/Mvvm/ViewModelLocationProviderFixture.cs +++ b/Source/Prism.Tests/Mvvm/ViewModelLocationProviderFixture.cs @@ -163,7 +163,7 @@ namespace Prism.Tests.Mvvm private static void ResetViewModelLocationProvider() { Type staticType = typeof(ViewModelLocationProvider); - ConstructorInfo ci = staticType.TypeInitializer; + ConstructorInfo ci = staticType.GetTypeInfo().TypeInitializer; object[] parameters = new object[0]; ci.Invoke(null, parameters); } diff --git a/Source/Prism.Tests/Prism.Tests.csproj b/Source/Prism.Tests/Prism.Tests.csproj index 680a557..96b46a3 100644 --- a/Source/Prism.Tests/Prism.Tests.csproj +++ b/Source/Prism.Tests/Prism.Tests.csproj @@ -1,143 +1,26 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{B6E74918-D92B-4690-BEC9-0BB199A6E933}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Prism.Tests</RootNamespace> - <AssemblyName>Prism.Tests</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> - <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> - <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath> - <IsCodedUITest>False</IsCodedUITest> - <TestProjectType>UnitTest</TestProjectType> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <OutputType>Exe</OutputType> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'"> + <DefineConstants>$(DefineConstants);DEBUG</DefineConstants> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|AnyCPU'"> - <OutputPath>bin\Test\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <Optimize>true</Optimize> - <DebugType>pdbonly</DebugType> - <PlatformTarget>AnyCPU</PlatformTarget> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemGroup> - <Reference Include="System" /> - <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath> - <Private>True</Private> - </Reference> - </ItemGroup> - <Choose> - <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'"> - <ItemGroup> - <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> - </ItemGroup> - </When> - <Otherwise /> - </Choose> + <ItemGroup> - <Compile Include="Commands\TestPurposeBindableBase.cs" /> - <Compile Include="Events\BackgroundEventSubscriptionFixture.cs" /> - <Compile Include="Events\DataEventArgsFixture.cs" /> - <Compile Include="Events\DelegateReferenceFixture.cs" /> - <Compile Include="Events\DispatcherEventSubscriptionFixture.cs" /> - <Compile Include="Events\EventAggregatorFixture.cs" /> - <Compile Include="Events\EventBaseFixture.cs" /> - <Compile Include="Events\EventSubscriptionFixture.cs" /> - <Compile Include="Events\MockDelegateReference.cs" /> - <Compile Include="Events\PubSubEventFixture.cs" /> - <Compile Include="Logging\DebugLoggerFixture.cs" /> - <Compile Include="Logging\EmptyLoggerFixture.cs" /> - <Compile Include="Mocks\ViewModels\MockValidatingViewModel.cs" /> - <Compile Include="Mocks\ViewModels\MockViewModel.cs" /> - <Compile Include="Mocks\Views\Mock.cs" /> - <Compile Include="Mocks\Views\MockView.cs" /> - <Compile Include="Mvvm\BindableBaseFixture.cs" /> - <Compile Include="Commands\CompositeCommandFixture.cs" /> - <Compile Include="Commands\DelegateCommandFixture.cs" /> - <Compile Include="Mvvm\ErrorsContainerFixture.cs" /> - <Compile Include="Mvvm\PropertySupportFixture.cs" /> - <Compile Include="Mvvm\ViewModelLocationProviderFixture.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" /> + <PackageReference Include="xunit" Version="2.3.0-beta1-build3642" /> + <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1309" /> </ItemGroup> + <ItemGroup> - <ProjectReference Include="..\Prism\Prism.csproj"> - <Project>{e6c50355-d01e-4caa-884d-d7929861315c}</Project> - <Name>Prism</Name> - </ProjectReference> + <ProjectReference Include="..\Prism\Prism.csproj" /> </ItemGroup> + <ItemGroup> - <None Include="packages.config" /> + <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> </ItemGroup> - <Choose> - <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'"> - <ItemGroup> - <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> - <Private>False</Private> - </Reference> - <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> - <Private>False</Private> - </Reference> - </ItemGroup> - </When> - </Choose> - <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" /> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" /> - </Target> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project>
\ No newline at end of file + +</Project> diff --git a/Source/Prism.Tests/Properties/AssemblyInfo.cs b/Source/Prism.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 72d9914..0000000 --- a/Source/Prism.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Prism.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Prism.Tests")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("a95cb7df-f667-44c7-9cac-750ba459a15d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Source/Prism.Tests/packages.config b/Source/Prism.Tests/packages.config deleted file mode 100644 index dcbf45e..0000000 --- a/Source/Prism.Tests/packages.config +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="xunit" version="2.1.0" targetFramework="net45" /> - <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" /> - <package id="xunit.assert" version="2.1.0" targetFramework="net45" /> - <package id="xunit.core" version="2.1.0" targetFramework="net45" /> - <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" /> - <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" /> - <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" /> -</packages>
\ No newline at end of file diff --git a/Source/Prism/Prism.csproj b/Source/Prism/Prism.csproj index e874434..2e5a4ed 100644 --- a/Source/Prism/Prism.csproj +++ b/Source/Prism/Prism.csproj @@ -1,105 +1,49 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{E6C50355-D01E-4CAA-884D-D7929861315C}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Prism</RootNamespace> + <TargetFrameworks>netstandard1.0;</TargetFrameworks> <AssemblyName>Prism</AssemblyName> - <DefaultLanguage>en-US</DefaultLanguage> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <TargetFrameworkProfile>Profile259</TargetFrameworkProfile> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <PackageId>Prism.Core</PackageId> + <NeutralLanguage>en</NeutralLanguage> + <!-- Summary is not actually supported at this time. Including the summary for future support. --> + <!--<Summary>Prism provides an implementation of a collection of design patterns that are helpful in writing well structured and maintainable applications.</Summary>--> + <Description>Prism is a fully open source version of the Prism guidance originally produced by Microsoft Patterns & Practices. Prism provides an implementation of a collection of design patterns that are helpful in writing well structured and maintainable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared code base in a Portable Class Library targeting these platforms; WPF, Windows 10 UWP, and Xamarin Forms. Features that need to be platform specific are implemented in the respective libraries for the target platform.</Description> + <PackageTags>prism;wpf;xamarin;mvvm;uwp;uap;xaml</PackageTags> + <Authors>Brian Lagunas;Brian Noyes</Authors> + <Owners>Brian Lagunas;Brian Noyes</Owners> + <PackageIconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</PackageIconUrl> + <PackageProjectUrl>https://github.com/PrismLibrary/Prism</PackageProjectUrl> + <PackageLicenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</PackageLicenseUrl> + <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> + <RepositoryType>git</RepositoryType> + <RepositoryUrl>https://github.com/PrismLibrary/Prism</RepositoryUrl> + <PackageOutputPath>../Build</PackageOutputPath> + <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version> + <!-- Update this version when incrementing Library Versions i.e. 7.1.0, 7.2.0 --> + <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' ">7.0.0</VersionPrefix> + <!-- This will create CI builds as 7.0.0-ci1234 --> + <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">ci$(APPVEYOR_BUILD_NUMBER)</VersionSuffix> + <SignAssembly>True</SignAssembly> + <AssemblyOriginatorKeyFile>..\prism.snk</AssemblyOriginatorKeyFile> + <DelaySign>False</DelaySign> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'"> + <DefineConstants>$(DefineConstants);DEBUG</DefineConstants> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <DocumentationFile>bin\Release\Prism.xml</DocumentationFile> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|AnyCPU'"> - <OutputPath>bin\Test\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <DocumentationFile>bin\Release\Prism.xml</DocumentationFile> - <Optimize>false</Optimize> - <DebugType>pdbonly</DebugType> - <PlatformTarget>AnyCPU</PlatformTarget> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup> - <SignAssembly>true</SignAssembly> - </PropertyGroup> - <PropertyGroup> - <AssemblyOriginatorKeyFile>../prism.snk</AssemblyOriginatorKeyFile> + + <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> + <GenerateDocumentationFile>True</GenerateDocumentationFile> + <GeneratePackageOnBuild>True</GeneratePackageOnBuild> </PropertyGroup> + <ItemGroup> - <!-- A reference to the entire .NET Framework is automatically included --> - <EmbeddedResource Include="Properties\Resources.resx"> - <Generator>ResXFileCodeGenerator</Generator> - <LastGenOutput>Resources.Designer.cs</LastGenOutput> - </EmbeddedResource> + <PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" /> </ItemGroup> + <ItemGroup> - <Compile Include="Commands\CompositeCommand.cs" /> - <Compile Include="Commands\DelegateCommand.cs" /> - <Compile Include="Commands\DelegateCommandBase.cs" /> - <Compile Include="Commands\DelegateCommand{T}.cs" /> - <Compile Include="Commands\PropertyObserver.cs" /> - <Compile Include="Commands\PropertyObserverNode.cs" /> - <Compile Include="Events\BackgroundEventSubscription.cs" /> - <Compile Include="Events\DataEventArgs.cs" /> - <Compile Include="Events\DelegateReference.cs" /> - <Compile Include="Events\DispatcherEventSubscription.cs" /> - <Compile Include="Events\EventAggregator.cs" /> - <Compile Include="Events\EventBase.cs" /> - <Compile Include="Events\EventSubscription.cs" /> - <Compile Include="Events\IDelegateReference.cs" /> - <Compile Include="Events\IEventAggregator.cs" /> - <Compile Include="Events\IEventSubscription.cs" /> - <Compile Include="Events\PubSubEvent.cs" /> - <Compile Include="Events\SubscriptionToken.cs" /> - <Compile Include="Events\ThreadOption.cs" /> - <Compile Include="IActiveAware.cs" /> - <Compile Include="Logging\Category.cs" /> - <Compile Include="Logging\DebugLogger.cs" /> - <Compile Include="Logging\EmptyLogger.cs" /> - <Compile Include="Logging\ILoggerFacade.cs" /> - <Compile Include="Logging\Priority.cs" /> - <Compile Include="Mvvm\BindableBase.cs" /> - <Compile Include="Mvvm\ErrorsContainer.cs" /> - <Compile Include="Mvvm\PropertySupport.cs" /> - <Compile Include="Mvvm\ViewModelLocationProvider.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Properties\Resources.Designer.cs"> - <AutoGen>True</AutoGen> - <DesignTime>True</DesignTime> - <DependentUpon>Resources.resx</DependentUpon> - </Compile> + <Compile Update="Properties\Resources.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="Resources.resx" /> + <EmbeddedResource Update="Properties\Resources.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Resources.Designer.cs" /> </ItemGroup> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project>
\ No newline at end of file + +</Project> diff --git a/Source/Prism/Properties/AssemblyInfo.cs b/Source/Prism/Properties/AssemblyInfo.cs deleted file mode 100644 index f5e20d4..0000000 --- a/Source/Prism/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Resources; -using System.Reflection; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Prism")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Prism")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] -[assembly: CLSCompliant(true)] - -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] diff --git a/Source/PrismLibrary.sln b/Source/PrismLibrary.sln index 5133973..824c872 100644 --- a/Source/PrismLibrary.sln +++ b/Source/PrismLibrary.sln @@ -1,9 +1,8 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism", "Prism\Prism.csproj", "{E6C50355-D01E-4CAA-884D-D7929861315C}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism", "Prism\Prism.csproj", "{6D4EACA5-275A-495F-A042-BB91247FDE50}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wpf", "Wpf", "{6BED0A37-BE6B-42D2-AAF0-C612FF57D9EB}" EndProject @@ -15,11 +14,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Mef.Wpf", "Wpf\Prism. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Unity.Wpf", "Wpf\Prism.Unity.Wpf\Prism.Unity.Wpf.csproj", "{C1CE34C7-6AC9-4D54-BAD0-8467E9F9F38D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Forms", "Xamarin\Prism.Forms\Prism.Forms.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Forms", "Xamarin\Prism.Forms\Prism.Forms.csproj", "{F2E2CF03-8566-4035-BC23-0F623D52AB16}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Unity.Forms", "Xamarin\Prism.Unity.Forms\Prism.Unity.Forms.csproj", "{79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Unity.Forms", "Xamarin\Prism.Unity.Forms\Prism.Unity.Forms.csproj", "{EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Tests", "Prism.Tests\Prism.Tests.csproj", "{B6E74918-D92B-4690-BEC9-0BB199A6E933}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Tests", "Prism.Tests\Prism.Tests.csproj", "{0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Unity.Wpf.Tests", "Wpf\Prism.Unity.Wpf.Tests\Prism.Unity.Wpf.Tests.csproj", "{75511F4B-2602-4623-945C-AF8156B51F4E}" EndProject @@ -49,16 +48,26 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Win10", "Win10", "{785CEF4D EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BD870EC2-18B3-4537-A74A-63784B915EB8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Ninject.Forms", "Xamarin\Prism.Ninject.Forms\Prism.Ninject.Forms.csproj", "{F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Ninject.Forms", "Xamarin\Prism.Ninject.Forms\Prism.Ninject.Forms.csproj", "{C9AB671D-4E7C-4036-B457-86EB0601E751}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.DryIoc.Forms", "Xamarin\Prism.DryIoc.Forms\Prism.DryIoc.Forms.csproj", "{174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.DryIoc.Forms", "Xamarin\Prism.DryIoc.Forms\Prism.DryIoc.Forms.csproj", "{CC969CD2-BE7E-4A83-BB5E-55E504C96E79}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Autofac.Forms", "Xamarin\Prism.Autofac.Forms\Prism.Autofac.Forms.csproj", "{943664CF-3A0C-4EFF-8BDA-29241D49DD85}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Autofac.Forms", "Xamarin\Prism.Autofac.Forms\Prism.Autofac.Forms.csproj", "{C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.DryIoc.Wpf.Tests", "Wpf\Prism.DryIoc.Wpf.Tests\Prism.DryIoc.Wpf.Tests.csproj", "{FCF3AC90-40B9-40D1-A2B7-754251DEFC1D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.DryIoc.Wpf", "Wpf\Prism.DryIoc.Wpf\Prism.DryIoc.Wpf.csproj", "{8ACF42B5-7765-44D0-BA22-D320F7ABC911}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Windows.Tests", "Windows10\Prism.Windows.Tests\Prism.Windows.Tests.csproj", "{2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Windows", "Windows10\Prism.Windows\Prism.Windows.csproj", "{3B7C3599-A336-4DB2-8678-710E3B36203B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Unity.Windows", "Windows10\Prism.Unity.Windows\Prism.Unity.Windows.csproj", "{B4060AD6-7A34-479C-B5EB-4C542A681F42}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.SimpleInjector.Windows", "Windows10\Prism.SimpleInjector.Windows\Prism.SimpleInjector.Windows.csproj", "{E6F934A2-3962-46F2-A4B8-416394C351B8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Autofac.Windows", "Windows10\Prism.Autofac.Windows\Prism.Autofac.Windows.csproj", "{CCE23E5B-335F-4B62-A964-77E42482F49A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -75,24 +84,24 @@ Global Test|x86 = Test|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E6C50355-D01E-4CAA-884D-D7929861315C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Debug|x64.ActiveCfg = Debug|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Debug|x86.ActiveCfg = Debug|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Release|Any CPU.Build.0 = Release|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Release|ARM.ActiveCfg = Release|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Release|x64.ActiveCfg = Release|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Release|x86.ActiveCfg = Release|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Test|Any CPU.ActiveCfg = Test|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Test|Any CPU.Build.0 = Test|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Test|ARM.ActiveCfg = Test|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Test|ARM.Build.0 = Test|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Test|x64.ActiveCfg = Test|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Test|x64.Build.0 = Test|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Test|x86.ActiveCfg = Test|Any CPU - {E6C50355-D01E-4CAA-884D-D7929861315C}.Test|x86.Build.0 = Test|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Debug|ARM.ActiveCfg = Debug|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Debug|x64.ActiveCfg = Debug|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Debug|x86.ActiveCfg = Debug|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Release|Any CPU.Build.0 = Release|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Release|ARM.ActiveCfg = Release|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Release|x64.ActiveCfg = Release|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Release|x86.ActiveCfg = Release|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Test|Any CPU.ActiveCfg = Test|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Test|Any CPU.Build.0 = Test|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Test|ARM.ActiveCfg = Test|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Test|ARM.Build.0 = Test|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Test|x64.ActiveCfg = Test|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Test|x64.Build.0 = Test|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Test|x86.ActiveCfg = Test|Any CPU + {6D4EACA5-275A-495F-A042-BB91247FDE50}.Test|x86.Build.0 = Test|Any CPU {5912FF03-C72B-4F56-BAA1-8642FDBFBC26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5912FF03-C72B-4F56-BAA1-8642FDBFBC26}.Debug|Any CPU.Build.0 = Debug|Any CPU {5912FF03-C72B-4F56-BAA1-8642FDBFBC26}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -147,60 +156,60 @@ Global {C1CE34C7-6AC9-4D54-BAD0-8467E9F9F38D}.Test|x64.Build.0 = Release|Any CPU {C1CE34C7-6AC9-4D54-BAD0-8467E9F9F38D}.Test|x86.ActiveCfg = Release|Any CPU {C1CE34C7-6AC9-4D54-BAD0-8467E9F9F38D}.Test|x86.Build.0 = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|ARM.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|x64.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|x86.ActiveCfg = Debug|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|Any CPU.Build.0 = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|ARM.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|x64.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|x86.ActiveCfg = Release|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Test|Any CPU.ActiveCfg = Test|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Test|Any CPU.Build.0 = Test|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Test|ARM.ActiveCfg = Test|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Test|ARM.Build.0 = Test|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Test|x64.ActiveCfg = Test|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Test|x64.Build.0 = Test|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Test|x86.ActiveCfg = Test|Any CPU - {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Test|x86.Build.0 = Test|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Debug|ARM.ActiveCfg = Debug|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Debug|x64.ActiveCfg = Debug|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Debug|x86.ActiveCfg = Debug|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Release|Any CPU.Build.0 = Release|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Release|ARM.ActiveCfg = Release|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Release|x64.ActiveCfg = Release|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Release|x86.ActiveCfg = Release|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Test|Any CPU.ActiveCfg = Test|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Test|Any CPU.Build.0 = Test|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Test|ARM.ActiveCfg = Test|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Test|ARM.Build.0 = Test|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Test|x64.ActiveCfg = Test|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Test|x64.Build.0 = Test|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Test|x86.ActiveCfg = Test|Any CPU - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}.Test|x86.Build.0 = Test|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Debug|ARM.ActiveCfg = Debug|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Debug|x64.ActiveCfg = Debug|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Debug|x86.ActiveCfg = Debug|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release|Any CPU.Build.0 = Release|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release|ARM.ActiveCfg = Release|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release|x64.ActiveCfg = Release|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Release|x86.ActiveCfg = Release|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Test|Any CPU.ActiveCfg = Test|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Test|Any CPU.Build.0 = Test|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Test|ARM.ActiveCfg = Test|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Test|ARM.Build.0 = Test|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Test|x64.ActiveCfg = Test|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Test|x64.Build.0 = Test|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Test|x86.ActiveCfg = Test|Any CPU - {B6E74918-D92B-4690-BEC9-0BB199A6E933}.Test|x86.Build.0 = Test|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Debug|ARM.ActiveCfg = Debug|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Debug|x64.ActiveCfg = Debug|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Debug|x86.ActiveCfg = Debug|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Release|Any CPU.Build.0 = Release|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Release|ARM.ActiveCfg = Release|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Release|x64.ActiveCfg = Release|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Release|x86.ActiveCfg = Release|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Test|Any CPU.ActiveCfg = Test|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Test|Any CPU.Build.0 = Test|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Test|ARM.ActiveCfg = Test|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Test|ARM.Build.0 = Test|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Test|x64.ActiveCfg = Test|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Test|x64.Build.0 = Test|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Test|x86.ActiveCfg = Test|Any CPU + {F2E2CF03-8566-4035-BC23-0F623D52AB16}.Test|x86.Build.0 = Test|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Debug|ARM.ActiveCfg = Debug|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Debug|x64.ActiveCfg = Debug|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Debug|x86.ActiveCfg = Debug|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Release|Any CPU.Build.0 = Release|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Release|ARM.ActiveCfg = Release|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Release|x64.ActiveCfg = Release|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Release|x86.ActiveCfg = Release|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Test|Any CPU.ActiveCfg = Test|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Test|Any CPU.Build.0 = Test|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Test|ARM.ActiveCfg = Test|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Test|ARM.Build.0 = Test|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Test|x64.ActiveCfg = Test|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Test|x64.Build.0 = Test|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Test|x86.ActiveCfg = Test|Any CPU + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF}.Test|x86.Build.0 = Test|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Debug|ARM.ActiveCfg = Debug|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Debug|x64.ActiveCfg = Debug|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Debug|x86.ActiveCfg = Debug|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Release|Any CPU.Build.0 = Release|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Release|ARM.ActiveCfg = Release|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Release|x64.ActiveCfg = Release|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Release|x86.ActiveCfg = Release|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Test|Any CPU.ActiveCfg = Test|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Test|Any CPU.Build.0 = Test|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Test|ARM.ActiveCfg = Test|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Test|ARM.Build.0 = Test|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Test|x64.ActiveCfg = Test|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Test|x64.Build.0 = Test|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Test|x86.ActiveCfg = Test|Any CPU + {0BE74E9C-8E78-47A5-B686-C5DDF801D2A0}.Test|x86.Build.0 = Test|Any CPU {75511F4B-2602-4623-945C-AF8156B51F4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {75511F4B-2602-4623-945C-AF8156B51F4E}.Debug|Any CPU.Build.0 = Debug|Any CPU {75511F4B-2602-4623-945C-AF8156B51F4E}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -393,78 +402,78 @@ Global {2823CA8B-DCBD-4694-B842-8A327DFCAA02}.Test|x64.Build.0 = Release|Any CPU {2823CA8B-DCBD-4694-B842-8A327DFCAA02}.Test|x86.ActiveCfg = Release|Any CPU {2823CA8B-DCBD-4694-B842-8A327DFCAA02}.Test|x86.Build.0 = Release|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Debug|ARM.ActiveCfg = Debug|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Debug|ARM.Build.0 = Debug|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Debug|x64.ActiveCfg = Debug|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Debug|x64.Build.0 = Debug|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Debug|x86.ActiveCfg = Debug|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Debug|x86.Build.0 = Debug|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Release|Any CPU.Build.0 = Release|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Release|ARM.ActiveCfg = Release|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Release|ARM.Build.0 = Release|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Release|x64.ActiveCfg = Release|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Release|x64.Build.0 = Release|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Release|x86.ActiveCfg = Release|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Release|x86.Build.0 = Release|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Test|Any CPU.ActiveCfg = Test|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Test|Any CPU.Build.0 = Test|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Test|ARM.ActiveCfg = Test|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Test|ARM.Build.0 = Test|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Test|x64.ActiveCfg = Test|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Test|x64.Build.0 = Test|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Test|x86.ActiveCfg = Test|Any CPU - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}.Test|x86.Build.0 = Test|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Debug|ARM.Build.0 = Debug|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Debug|x64.ActiveCfg = Debug|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Debug|x64.Build.0 = Debug|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Debug|x86.ActiveCfg = Debug|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Debug|x86.Build.0 = Debug|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Release|Any CPU.Build.0 = Release|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Release|ARM.ActiveCfg = Release|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Release|ARM.Build.0 = Release|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Release|x64.ActiveCfg = Release|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Release|x64.Build.0 = Release|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Release|x86.ActiveCfg = Release|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Release|x86.Build.0 = Release|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Test|Any CPU.ActiveCfg = Test|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Test|Any CPU.Build.0 = Test|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Test|ARM.ActiveCfg = Test|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Test|ARM.Build.0 = Test|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Test|x64.ActiveCfg = Test|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Test|x64.Build.0 = Test|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Test|x86.ActiveCfg = Test|Any CPU - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}.Test|x86.Build.0 = Test|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Debug|Any CPU.Build.0 = Debug|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Debug|ARM.ActiveCfg = Debug|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Debug|ARM.Build.0 = Debug|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Debug|x64.ActiveCfg = Debug|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Debug|x64.Build.0 = Debug|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Debug|x86.ActiveCfg = Debug|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Debug|x86.Build.0 = Debug|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Release|Any CPU.ActiveCfg = Release|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Release|Any CPU.Build.0 = Release|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Release|ARM.ActiveCfg = Release|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Release|ARM.Build.0 = Release|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Release|x64.ActiveCfg = Release|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Release|x64.Build.0 = Release|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Release|x86.ActiveCfg = Release|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Release|x86.Build.0 = Release|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Test|Any CPU.ActiveCfg = Test|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Test|Any CPU.Build.0 = Test|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Test|ARM.ActiveCfg = Test|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Test|ARM.Build.0 = Test|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Test|x64.ActiveCfg = Test|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Test|x64.Build.0 = Test|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Test|x86.ActiveCfg = Test|Any CPU - {943664CF-3A0C-4EFF-8BDA-29241D49DD85}.Test|x86.Build.0 = Test|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Debug|ARM.ActiveCfg = Debug|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Debug|ARM.Build.0 = Debug|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Debug|x64.ActiveCfg = Debug|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Debug|x64.Build.0 = Debug|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Debug|x86.ActiveCfg = Debug|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Debug|x86.Build.0 = Debug|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Release|Any CPU.Build.0 = Release|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Release|ARM.ActiveCfg = Release|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Release|ARM.Build.0 = Release|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Release|x64.ActiveCfg = Release|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Release|x64.Build.0 = Release|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Release|x86.ActiveCfg = Release|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Release|x86.Build.0 = Release|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Test|Any CPU.ActiveCfg = Test|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Test|Any CPU.Build.0 = Test|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Test|ARM.ActiveCfg = Test|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Test|ARM.Build.0 = Test|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Test|x64.ActiveCfg = Test|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Test|x64.Build.0 = Test|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Test|x86.ActiveCfg = Test|Any CPU + {C9AB671D-4E7C-4036-B457-86EB0601E751}.Test|x86.Build.0 = Test|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Debug|ARM.ActiveCfg = Debug|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Debug|ARM.Build.0 = Debug|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Debug|x64.ActiveCfg = Debug|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Debug|x64.Build.0 = Debug|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Debug|x86.ActiveCfg = Debug|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Debug|x86.Build.0 = Debug|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Release|Any CPU.Build.0 = Release|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Release|ARM.ActiveCfg = Release|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Release|ARM.Build.0 = Release|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Release|x64.ActiveCfg = Release|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Release|x64.Build.0 = Release|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Release|x86.ActiveCfg = Release|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Release|x86.Build.0 = Release|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Test|Any CPU.ActiveCfg = Test|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Test|Any CPU.Build.0 = Test|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Test|ARM.ActiveCfg = Test|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Test|ARM.Build.0 = Test|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Test|x64.ActiveCfg = Test|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Test|x64.Build.0 = Test|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Test|x86.ActiveCfg = Test|Any CPU + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79}.Test|x86.Build.0 = Test|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Debug|ARM.ActiveCfg = Debug|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Debug|ARM.Build.0 = Debug|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Debug|x64.ActiveCfg = Debug|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Debug|x64.Build.0 = Debug|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Debug|x86.ActiveCfg = Debug|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Debug|x86.Build.0 = Debug|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Release|Any CPU.Build.0 = Release|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Release|ARM.ActiveCfg = Release|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Release|ARM.Build.0 = Release|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Release|x64.ActiveCfg = Release|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Release|x64.Build.0 = Release|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Release|x86.ActiveCfg = Release|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Release|x86.Build.0 = Release|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Test|Any CPU.ActiveCfg = Test|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Test|Any CPU.Build.0 = Test|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Test|ARM.ActiveCfg = Test|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Test|ARM.Build.0 = Test|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Test|x64.ActiveCfg = Test|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Test|x64.Build.0 = Test|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Test|x86.ActiveCfg = Test|Any CPU + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0}.Test|x86.Build.0 = Test|Any CPU {FCF3AC90-40B9-40D1-A2B7-754251DEFC1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FCF3AC90-40B9-40D1-A2B7-754251DEFC1D}.Debug|Any CPU.Build.0 = Debug|Any CPU {FCF3AC90-40B9-40D1-A2B7-754251DEFC1D}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -513,6 +522,138 @@ Global {8ACF42B5-7765-44D0-BA22-D320F7ABC911}.Test|x64.Build.0 = Release|Any CPU {8ACF42B5-7765-44D0-BA22-D320F7ABC911}.Test|x86.ActiveCfg = Release|Any CPU {8ACF42B5-7765-44D0-BA22-D320F7ABC911}.Test|x86.Build.0 = Release|Any CPU + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|ARM.ActiveCfg = Debug|ARM + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|ARM.Build.0 = Debug|ARM + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|ARM.Deploy.0 = Debug|ARM + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|x64.ActiveCfg = Debug|x64 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|x64.Build.0 = Debug|x64 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|x64.Deploy.0 = Debug|x64 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|x86.ActiveCfg = Debug|x86 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|x86.Build.0 = Debug|x86 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Debug|x86.Deploy.0 = Debug|x86 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|Any CPU.Build.0 = Release|Any CPU + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|Any CPU.Deploy.0 = Release|Any CPU + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|ARM.ActiveCfg = Release|ARM + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|ARM.Build.0 = Release|ARM + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|ARM.Deploy.0 = Release|ARM + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|x64.ActiveCfg = Release|x64 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|x64.Build.0 = Release|x64 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|x64.Deploy.0 = Release|x64 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|x86.ActiveCfg = Release|x86 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|x86.Build.0 = Release|x86 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Release|x86.Deploy.0 = Release|x86 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Test|Any CPU.ActiveCfg = Release|Any CPU + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Test|Any CPU.Build.0 = Release|Any CPU + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Test|Any CPU.Deploy.0 = Release|Any CPU + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Test|ARM.ActiveCfg = Release|ARM + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Test|ARM.Build.0 = Release|ARM + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Test|ARM.Deploy.0 = Release|ARM + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Test|x64.ActiveCfg = Release|x64 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Test|x64.Build.0 = Release|x64 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Test|x64.Deploy.0 = Release|x64 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Test|x86.ActiveCfg = Release|x86 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Test|x86.Build.0 = Release|x86 + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27}.Test|x86.Deploy.0 = Release|x86 + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Debug|ARM.ActiveCfg = Debug|ARM + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Debug|ARM.Build.0 = Debug|ARM + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Debug|x64.ActiveCfg = Debug|x64 + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Debug|x64.Build.0 = Debug|x64 + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Debug|x86.ActiveCfg = Debug|x86 + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Debug|x86.Build.0 = Debug|x86 + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Release|Any CPU.Build.0 = Release|Any CPU + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Release|ARM.ActiveCfg = Release|ARM + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Release|ARM.Build.0 = Release|ARM + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Release|x64.ActiveCfg = Release|x64 + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Release|x64.Build.0 = Release|x64 + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Release|x86.ActiveCfg = Release|x86 + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Release|x86.Build.0 = Release|x86 + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Test|Any CPU.ActiveCfg = Release|Any CPU + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Test|Any CPU.Build.0 = Release|Any CPU + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Test|ARM.ActiveCfg = Release|ARM + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Test|ARM.Build.0 = Release|ARM + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Test|x64.ActiveCfg = Release|x64 + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Test|x64.Build.0 = Release|x64 + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Test|x86.ActiveCfg = Release|x86 + {3B7C3599-A336-4DB2-8678-710E3B36203B}.Test|x86.Build.0 = Release|x86 + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Debug|ARM.ActiveCfg = Debug|ARM + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Debug|ARM.Build.0 = Debug|ARM + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Debug|x64.ActiveCfg = Debug|x64 + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Debug|x64.Build.0 = Debug|x64 + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Debug|x86.ActiveCfg = Debug|x86 + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Debug|x86.Build.0 = Debug|x86 + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Release|Any CPU.Build.0 = Release|Any CPU + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Release|ARM.ActiveCfg = Release|ARM + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Release|ARM.Build.0 = Release|ARM + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Release|x64.ActiveCfg = Release|x64 + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Release|x64.Build.0 = Release|x64 + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Release|x86.ActiveCfg = Release|x86 + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Release|x86.Build.0 = Release|x86 + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Test|Any CPU.ActiveCfg = Release|Any CPU + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Test|Any CPU.Build.0 = Release|Any CPU + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Test|ARM.ActiveCfg = Release|ARM + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Test|ARM.Build.0 = Release|ARM + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Test|x64.ActiveCfg = Release|x64 + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Test|x64.Build.0 = Release|x64 + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Test|x86.ActiveCfg = Release|x86 + {B4060AD6-7A34-479C-B5EB-4C542A681F42}.Test|x86.Build.0 = Release|x86 + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Debug|ARM.ActiveCfg = Debug|ARM + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Debug|ARM.Build.0 = Debug|ARM + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Debug|x64.ActiveCfg = Debug|x64 + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Debug|x64.Build.0 = Debug|x64 + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Debug|x86.ActiveCfg = Debug|x86 + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Debug|x86.Build.0 = Debug|x86 + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Release|Any CPU.Build.0 = Release|Any CPU + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Release|ARM.ActiveCfg = Release|ARM + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Release|ARM.Build.0 = Release|ARM + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Release|x64.ActiveCfg = Release|x64 + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Release|x64.Build.0 = Release|x64 + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Release|x86.ActiveCfg = Release|x86 + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Release|x86.Build.0 = Release|x86 + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Test|Any CPU.ActiveCfg = Release|Any CPU + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Test|Any CPU.Build.0 = Release|Any CPU + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Test|ARM.ActiveCfg = Release|ARM + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Test|ARM.Build.0 = Release|ARM + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Test|x64.ActiveCfg = Release|x64 + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Test|x64.Build.0 = Release|x64 + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Test|x86.ActiveCfg = Release|x86 + {E6F934A2-3962-46F2-A4B8-416394C351B8}.Test|x86.Build.0 = Release|x86 + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Debug|ARM.ActiveCfg = Debug|ARM + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Debug|ARM.Build.0 = Debug|ARM + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Debug|x64.ActiveCfg = Debug|x64 + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Debug|x64.Build.0 = Debug|x64 + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Debug|x86.ActiveCfg = Debug|x86 + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Debug|x86.Build.0 = Debug|x86 + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Release|Any CPU.Build.0 = Release|Any CPU + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Release|ARM.ActiveCfg = Release|ARM + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Release|ARM.Build.0 = Release|ARM + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Release|x64.ActiveCfg = Release|x64 + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Release|x64.Build.0 = Release|x64 + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Release|x86.ActiveCfg = Release|x86 + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Release|x86.Build.0 = Release|x86 + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Test|Any CPU.ActiveCfg = Release|Any CPU + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Test|Any CPU.Build.0 = Release|Any CPU + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Test|ARM.ActiveCfg = Release|ARM + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Test|ARM.Build.0 = Release|ARM + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Test|x64.ActiveCfg = Release|x64 + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Test|x64.Build.0 = Release|x64 + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Test|x86.ActiveCfg = Release|x86 + {CCE23E5B-335F-4B62-A964-77E42482F49A}.Test|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -521,8 +662,8 @@ Global {5912FF03-C72B-4F56-BAA1-8642FDBFBC26} = {6BED0A37-BE6B-42D2-AAF0-C612FF57D9EB} {3D6AEBE9-F824-4350-A007-EAC3CF030338} = {6BED0A37-BE6B-42D2-AAF0-C612FF57D9EB} {C1CE34C7-6AC9-4D54-BAD0-8467E9F9F38D} = {6BED0A37-BE6B-42D2-AAF0-C612FF57D9EB} - {67F9D3A8-F71E-4428-913F-C37AE82CDB24} = {77BDC65B-6FFD-447F-82A5-BA026A7719AE} - {79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7} = {77BDC65B-6FFD-447F-82A5-BA026A7719AE} + {F2E2CF03-8566-4035-BC23-0F623D52AB16} = {77BDC65B-6FFD-447F-82A5-BA026A7719AE} + {EA0E4FE1-94F6-4D30-A872-ED07C01A7DEF} = {77BDC65B-6FFD-447F-82A5-BA026A7719AE} {75511F4B-2602-4623-945C-AF8156B51F4E} = {AD25EEBB-B23F-4238-BF4B-0E3199142E7F} {F6443399-3E76-4B51-964A-95A166239D56} = {AD25EEBB-B23F-4238-BF4B-0E3199142E7F} {B9BD4B23-8163-4EF3-955F-02B9578C45BA} = {AD25EEBB-B23F-4238-BF4B-0E3199142E7F} @@ -536,10 +677,15 @@ Global {AD25EEBB-B23F-4238-BF4B-0E3199142E7F} = {6BED0A37-BE6B-42D2-AAF0-C612FF57D9EB} {2556BF50-B8A0-4F08-8309-FE53A1B9EFC6} = {77BDC65B-6FFD-447F-82A5-BA026A7719AE} {BD870EC2-18B3-4537-A74A-63784B915EB8} = {785CEF4D-2A96-4B25-91A9-3C18EF055223} - {F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1} = {77BDC65B-6FFD-447F-82A5-BA026A7719AE} - {174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B} = {77BDC65B-6FFD-447F-82A5-BA026A7719AE} - {943664CF-3A0C-4EFF-8BDA-29241D49DD85} = {77BDC65B-6FFD-447F-82A5-BA026A7719AE} + {C9AB671D-4E7C-4036-B457-86EB0601E751} = {77BDC65B-6FFD-447F-82A5-BA026A7719AE} + {CC969CD2-BE7E-4A83-BB5E-55E504C96E79} = {77BDC65B-6FFD-447F-82A5-BA026A7719AE} + {C4234406-3D7A-44E4-BE2A-F35EA5BCD7C0} = {77BDC65B-6FFD-447F-82A5-BA026A7719AE} {FCF3AC90-40B9-40D1-A2B7-754251DEFC1D} = {AD25EEBB-B23F-4238-BF4B-0E3199142E7F} {8ACF42B5-7765-44D0-BA22-D320F7ABC911} = {6BED0A37-BE6B-42D2-AAF0-C612FF57D9EB} + {2E737FE0-857A-41AF-BA0A-42B0CDCCAA27} = {BD870EC2-18B3-4537-A74A-63784B915EB8} + {3B7C3599-A336-4DB2-8678-710E3B36203B} = {785CEF4D-2A96-4B25-91A9-3C18EF055223} + {B4060AD6-7A34-479C-B5EB-4C542A681F42} = {785CEF4D-2A96-4B25-91A9-3C18EF055223} + {E6F934A2-3962-46F2-A4B8-416394C351B8} = {785CEF4D-2A96-4B25-91A9-3C18EF055223} + {CCE23E5B-335F-4B62-A964-77E42482F49A} = {785CEF4D-2A96-4B25-91A9-3C18EF055223} EndGlobalSection EndGlobal diff --git a/Source/PrismLibrary_Core.sln b/Source/PrismLibrary_Core.sln index 553911c..8cac0ae 100644 --- a/Source/PrismLibrary_Core.sln +++ b/Source/PrismLibrary_Core.sln @@ -1,8 +1,7 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism", "Prism\Prism.csproj", "{E6C50355-D01E-4CAA-884D-D7929861315C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Tests", "Prism.Tests\Prism.Tests.csproj", "{B6E74918-D92B-4690-BEC9-0BB199A6E933}" diff --git a/Source/PrismLibrary_Win10.sln b/Source/PrismLibrary_Win10.sln index b9c1324..dc309ff 100644 --- a/Source/PrismLibrary_Win10.sln +++ b/Source/PrismLibrary_Win10.sln @@ -1,8 +1,7 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism", "Prism\Prism.csproj", "{E6C50355-D01E-4CAA-884D-D7929861315C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{643425A5-9223-491A-84D9-DFCC6BDD7F9B}" diff --git a/Source/PrismLibrary_Wpf.sln b/Source/PrismLibrary_Wpf.sln index 07e3bf1..bd1bffd 100644 --- a/Source/PrismLibrary_Wpf.sln +++ b/Source/PrismLibrary_Wpf.sln @@ -1,8 +1,7 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism", "Prism\Prism.csproj", "{E6C50355-D01E-4CAA-884D-D7929861315C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Wpf", "Wpf\Prism.Wpf\Prism.Wpf.csproj", "{5912FF03-C72B-4F56-BAA1-8642FDBFBC26}" diff --git a/Source/PrismLibrary_XF.sln b/Source/PrismLibrary_XF.sln index 09daf72..402b485 100644 --- a/Source/PrismLibrary_XF.sln +++ b/Source/PrismLibrary_XF.sln @@ -1,8 +1,7 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26403.7 -MinimumVisualStudioVersion = 10.0.40219.1 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism", "Prism\Prism.csproj", "{E6C50355-D01E-4CAA-884D-D7929861315C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Forms", "Xamarin\Prism.Forms\Prism.Forms.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}" @@ -27,17 +26,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Autofac.Forms", "Xama EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Autofac.Forms.Tests", "Xamarin\Prism.Autofac.Forms.Tests\Prism.Autofac.Forms.Tests.csproj", "{0CB2C41D-2620-4FAF-9F73-FEAE52D93F29}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Prism.DI.Forms.Tests", "Xamarin\Prism.DI.Forms.Tests\Prism.DI.Forms.Tests.shproj", "{7E004833-51E6-4C9A-9742-62D604F04642}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Unity.Forms.Tests", "Xamarin\Prism.Unity.Forms.Tests\Prism.Unity.Forms.Tests.csproj", "{2B5E37A2-B719-478A-A513-FBFA08F7EED6}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - Xamarin\Prism.DI.Forms.Tests\Prism.DI.Forms.Tests.projitems*{0cb2c41d-2620-4faf-9f73-feae52d93f29}*SharedItemsImports = 4 - Xamarin\Prism.DI.Forms.Tests\Prism.DI.Forms.Tests.projitems*{1d1b893c-3f38-436f-a507-d65310b9d2a0}*SharedItemsImports = 4 - Xamarin\Prism.DI.Forms.Tests\Prism.DI.Forms.Tests.projitems*{2b5e37a2-b719-478a-a513-fbfa08f7eed6}*SharedItemsImports = 4 - Xamarin\Prism.DI.Forms.Tests\Prism.DI.Forms.Tests.projitems*{7e004833-51e6-4c9a-9742-62d604f04642}*SharedItemsImports = 13 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM @@ -221,7 +212,6 @@ Global {DD171BA8-7B2D-4722-B5BF-E0A9EBFA1D5F} = {FEC22018-CBB0-493A-942D-59D1B93496E8} {1D1B893C-3F38-436F-A507-D65310B9D2A0} = {FEC22018-CBB0-493A-942D-59D1B93496E8} {0CB2C41D-2620-4FAF-9F73-FEAE52D93F29} = {FEC22018-CBB0-493A-942D-59D1B93496E8} - {7E004833-51E6-4C9A-9742-62D604F04642} = {FEC22018-CBB0-493A-942D-59D1B93496E8} {2B5E37A2-B719-478A-A513-FBFA08F7EED6} = {FEC22018-CBB0-493A-942D-59D1B93496E8} EndGlobalSection EndGlobal diff --git a/Source/Windows10/Prism.Autofac.Windows/Properties/AssemblyInfo.cs b/Source/Windows10/Prism.Autofac.Windows/Properties/AssemblyInfo.cs index 5712878..a9446b4 100644 --- a/Source/Windows10/Prism.Autofac.Windows/Properties/AssemblyInfo.cs +++ b/Source/Windows10/Prism.Autofac.Windows/Properties/AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] +[assembly: AssemblyVersion("7.0")] +[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyInformationalVersion("7.0.0")] [assembly: ComVisible(false)]
\ No newline at end of file diff --git a/Source/Windows10/Prism.SimpleInjector.Windows/Properties/AssemblyInfo.cs b/Source/Windows10/Prism.SimpleInjector.Windows/Properties/AssemblyInfo.cs index 16b260d..a7f2cb2 100644 --- a/Source/Windows10/Prism.SimpleInjector.Windows/Properties/AssemblyInfo.cs +++ b/Source/Windows10/Prism.SimpleInjector.Windows/Properties/AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] +[assembly: AssemblyVersion("7.0")] +[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyInformationalVersion("7.0.0")] [assembly: ComVisible(false)]
\ No newline at end of file diff --git a/Source/Windows10/Prism.Unity.Windows/Properties/AssemblyInfo.cs b/Source/Windows10/Prism.Unity.Windows/Properties/AssemblyInfo.cs index 2d48b95..25daa7b 100644 --- a/Source/Windows10/Prism.Unity.Windows/Properties/AssemblyInfo.cs +++ b/Source/Windows10/Prism.Unity.Windows/Properties/AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] +[assembly: AssemblyVersion("7.0")] +[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyInformationalVersion("7.0.0")] [assembly: ComVisible(false)]
\ No newline at end of file diff --git a/Source/Windows10/Prism.Unity.Windows/packages.config b/Source/Windows10/Prism.Unity.Windows/packages.config deleted file mode 100644 index db291d0..0000000 --- a/Source/Windows10/Prism.Unity.Windows/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="CommonServiceLocator" version="1.3.0" targetFramework="win81" userInstalled="true" /> - <package id="System.Numerics.Vectors" version="4.0.0" targetFramework="win81" userInstalled="true" /> - <package id="Unity" version="3.5.1404" targetFramework="win81" userInstalled="true" /> -</packages>
\ No newline at end of file diff --git a/Source/Windows10/Prism.Windows/Properties/AssemblyInfo.cs b/Source/Windows10/Prism.Windows/Properties/AssemblyInfo.cs index 78892e4..2e6c2c4 100644 --- a/Source/Windows10/Prism.Windows/Properties/AssemblyInfo.cs +++ b/Source/Windows10/Prism.Windows/Properties/AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] +[assembly: AssemblyVersion("7.0")] +[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyInformationalVersion("7.0.0")] [assembly: ComVisible(false)] diff --git a/Source/Wpf/Prism.Autofac.Wpf/Properties/AssemblyInfo.cs b/Source/Wpf/Prism.Autofac.Wpf/Properties/AssemblyInfo.cs index 24ad948..9a39cb2 100644 --- a/Source/Wpf/Prism.Autofac.Wpf/Properties/AssemblyInfo.cs +++ b/Source/Wpf/Prism.Autofac.Wpf/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Windows; // app, or any theme specific resource dictionaries) )] -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] +[assembly: AssemblyVersion("7.0")] +[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyInformationalVersion("7.0.0")] diff --git a/Source/Wpf/Prism.DryIoc.Wpf/Properties/AssemblyInfo.cs b/Source/Wpf/Prism.DryIoc.Wpf/Properties/AssemblyInfo.cs index c6c3e44..4b6257d 100644 --- a/Source/Wpf/Prism.DryIoc.Wpf/Properties/AssemblyInfo.cs +++ b/Source/Wpf/Prism.DryIoc.Wpf/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] +[assembly: AssemblyVersion("7.0")] +[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyInformationalVersion("7.0.0")] diff --git a/Source/Wpf/Prism.Mef.Wpf/Properties/AssemblyInfo.cs b/Source/Wpf/Prism.Mef.Wpf/Properties/AssemblyInfo.cs index 927c686..1fe8fd9 100644 --- a/Source/Wpf/Prism.Mef.Wpf/Properties/AssemblyInfo.cs +++ b/Source/Wpf/Prism.Mef.Wpf/Properties/AssemblyInfo.cs @@ -43,6 +43,6 @@ using System.Windows; )] -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] +[assembly: AssemblyVersion("7.0")] +[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyInformationalVersion("7.0.0")] diff --git a/Source/Wpf/Prism.Ninject.Wpf/Properties/AssemblyInfo.cs b/Source/Wpf/Prism.Ninject.Wpf/Properties/AssemblyInfo.cs index 56fc957..2b94563 100644 --- a/Source/Wpf/Prism.Ninject.Wpf/Properties/AssemblyInfo.cs +++ b/Source/Wpf/Prism.Ninject.Wpf/Properties/AssemblyInfo.cs @@ -24,6 +24,6 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("2ec2328c-15dc-4d9c-8e30-75df6d607917")] -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] +[assembly: AssemblyVersion("7.0")] +[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyInformationalVersion("7.0.0")] diff --git a/Source/Wpf/Prism.StructureMap.Wpf/Properties/AssemblyInfo.cs b/Source/Wpf/Prism.StructureMap.Wpf/Properties/AssemblyInfo.cs index 9f4ef1a..d88ab39 100644 --- a/Source/Wpf/Prism.StructureMap.Wpf/Properties/AssemblyInfo.cs +++ b/Source/Wpf/Prism.StructureMap.Wpf/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Windows; // app, or any theme specific resource dictionaries) )] -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] +[assembly: AssemblyVersion("7.0")] +[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyInformationalVersion("7.0.0")] diff --git a/Source/Wpf/Prism.Unity.Wpf/Properties/AssemblyInfo.cs b/Source/Wpf/Prism.Unity.Wpf/Properties/AssemblyInfo.cs index 0b722ea..129c1d9 100644 --- a/Source/Wpf/Prism.Unity.Wpf/Properties/AssemblyInfo.cs +++ b/Source/Wpf/Prism.Unity.Wpf/Properties/AssemblyInfo.cs @@ -43,6 +43,6 @@ using System.Windows; )] -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] +[assembly: AssemblyVersion("7.0")] +[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyInformationalVersion("7.0.0")] diff --git a/Source/Wpf/Prism.Wpf/Properties/AssemblyInfo.cs b/Source/Wpf/Prism.Wpf/Properties/AssemblyInfo.cs index 4c27350..4538706 100644 --- a/Source/Wpf/Prism.Wpf/Properties/AssemblyInfo.cs +++ b/Source/Wpf/Prism.Wpf/Properties/AssemblyInfo.cs @@ -50,6 +50,6 @@ using System.Windows.Markup; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] +[assembly: AssemblyVersion("7.0")] +[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyInformationalVersion("7.0.0")] diff --git a/Source/Xamarin/Prism.Autofac.Forms.Tests/Prism.Autofac.Forms.Tests.csproj b/Source/Xamarin/Prism.Autofac.Forms.Tests/Prism.Autofac.Forms.Tests.csproj index 5a27a81..fca8e80 100644 --- a/Source/Xamarin/Prism.Autofac.Forms.Tests/Prism.Autofac.Forms.Tests.csproj +++ b/Source/Xamarin/Prism.Autofac.Forms.Tests/Prism.Autofac.Forms.Tests.csproj @@ -1,125 +1,32 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" /> - <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.visualstudio.props')" /> - <Import Project="..\Prism.DI.Forms.Tests\Prism.DI.Forms.Tests.projitems" Label="Shared" Condition="Exists('..\Prism.DI.Forms.Tests\Prism.DI.Forms.Tests.projitems')" /> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{0CB2C41D-2620-4FAF-9F73-FEAE52D93F29}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> + <TargetFramework>netcoreapp1.1</TargetFramework> + <OutputType>Exe</OutputType> + <PackageTargetFallback>$(PackageTargetFallback);portable-win+net45+wp8+win81+wpa8</PackageTargetFallback> <RootNamespace>Prism.Autofac.Forms.Tests</RootNamespace> <AssemblyName>Prism.Autofac.Forms.Tests</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <TargetFrameworkProfile>Profile111</TargetFrameworkProfile> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|AnyCPU'"> - <DebugSymbols>true</DebugSymbols> - <OutputPath>bin\Test\</OutputPath> - <DefineConstants>TRACE;DEBUG;TEST</DefineConstants> - <DebugType>full</DebugType> - <PlatformTarget>AnyCPU</PlatformTarget> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemGroup> - <Compile Include="Mocks\PrismApplicationMock.cs" /> - <Compile Include="PrismApplicationFixture.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - </ItemGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'" /> + <ItemGroup> - <Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Autofac.3.5.2\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Autofac.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.execution.dotnet, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.execution.dotnet.dll</HintPath> - <Private>True</Private> - </Reference> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" /> + <PackageReference Include="xunit" Version="2.3.0-beta1-build3642" /> + <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1309" /> </ItemGroup> + <ItemGroup> - <None Include="packages.config" /> + <ProjectReference Include="..\Prism.Autofac.Forms\Prism.Autofac.Forms.csproj" /> </ItemGroup> + <ItemGroup> - <ProjectReference Include="..\..\Prism\Prism.csproj"> - <Project>{e6c50355-d01e-4caa-884d-d7929861315c}</Project> - <Name>Prism</Name> - </ProjectReference> - <ProjectReference Include="..\Prism.Autofac.Forms\Prism.Autofac.Forms.csproj"> - <Project>{943664cf-3a0c-4eff-8bda-29241d49dd85}</Project> - <Name>Prism.Autofac.Forms</Name> - </ProjectReference> - <ProjectReference Include="..\Prism.Forms\Prism.Forms.csproj"> - <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project> - <Name>Prism.Forms</Name> - </ProjectReference> + <Compile Include="../Prism.DI.Forms.Tests/**/*.cs" /> </ItemGroup> + <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> </ItemGroup> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.visualstudio.props'))" /> - <Error Condition="!Exists('..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props'))" /> - <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> - </Target> - <Import Project="..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> + </Project>
\ No newline at end of file diff --git a/Source/Xamarin/Prism.Autofac.Forms.Tests/Properties/AssemblyInfo.cs b/Source/Xamarin/Prism.Autofac.Forms.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index d8f49c9..0000000 --- a/Source/Xamarin/Prism.Autofac.Forms.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Prism.Autofac.Forms.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Prism.Autofac.Forms.Tests")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Source/Xamarin/Prism.Autofac.Forms.Tests/packages.config b/Source/Xamarin/Prism.Autofac.Forms.Tests/packages.config deleted file mode 100644 index e339ce2..0000000 --- a/Source/Xamarin/Prism.Autofac.Forms.Tests/packages.config +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Autofac" version="3.5.2" targetFramework="portable45-net45+win8+wpa81" /> - <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="portable45-net45+win8+wpa81" /> - <package id="xunit" version="2.1.0" targetFramework="portable45-net45+win8+wpa81" /> - <package id="xunit.abstractions" version="2.0.0" targetFramework="portable45-net45+win8+wpa81" /> - <package id="xunit.assert" version="2.1.0" targetFramework="portable45-net45+win8+wpa81" /> - <package id="xunit.core" version="2.1.0" targetFramework="portable45-net45+win8+wpa81" /> - <package id="xunit.extensibility.core" version="2.1.0" targetFramework="portable45-net45+win8+wpa81" /> - <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="portable45-net45+win8+wpa81" /> - <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="portable45-net45+win8+wpa81" /> -</packages>
\ No newline at end of file diff --git a/Source/Xamarin/Prism.Autofac.Forms/Prism.Autofac.Forms.csproj b/Source/Xamarin/Prism.Autofac.Forms/Prism.Autofac.Forms.csproj index 8be583a..310de87 100644 --- a/Source/Xamarin/Prism.Autofac.Forms/Prism.Autofac.Forms.csproj +++ b/Source/Xamarin/Prism.Autofac.Forms/Prism.Autofac.Forms.csproj @@ -1,102 +1,46 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{943664CF-3A0C-4EFF-8BDA-29241D49DD85}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Prism.Autofac.Forms</RootNamespace> + <TargetFrameworks>netstandard1.1;</TargetFrameworks> <AssemblyName>Prism.Autofac.Forms</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <TargetFrameworkProfile>Profile259</TargetFrameworkProfile> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> + <PackageId>Prism.Autofac.Forms</PackageId> + <Title>Autofac for Prism for Xamarin.Forms</Title> + <NeutralLanguage>en-US</NeutralLanguage> + <!-- Summary is not actually supported at this time. Including the summary for future support. --> + <!--<Summary>Autofac extensions for Prism for Xamarin.Forms.</Summary>--> + <Description>Use these extensions to build Xamarin.Forms applications with Prism and Autofac.</Description> + <PackageTags>prism;xamarin;xamarin.forms;autofac;dependency injection</PackageTags> + <Authors>Brian Lagunas;Brian Noyes</Authors> + <Owners>Brian Lagunas;Brian Noyes</Owners> + <PackageIconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</PackageIconUrl> + <PackageProjectUrl>https://github.com/PrismLibrary/Prism</PackageProjectUrl> + <PackageLicenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</PackageLicenseUrl> + <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> + <RepositoryType>git</RepositoryType> + <RepositoryUrl>https://github.com/PrismLibrary/Prism</RepositoryUrl> + <PackageOutputPath>../../Build</PackageOutputPath> + <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version> + <!-- Update this version when incrementing Library Versions i.e. 7.1.0, 7.2.0 --> + <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' ">7.0.0</VersionPrefix> + <!-- This will create CI builds as 7.0.0-ci1234 --> + <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">ci$(APPVEYOR_BUILD_NUMBER)</VersionSuffix> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'"> + <DefineConstants>$(DefineConstants);DEBUG</DefineConstants> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <DocumentationFile>bin\Release\Prism.Autofac.Forms.XML</DocumentationFile> + + <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> + <GenerateDocumentationFile>True</GenerateDocumentationFile> + <GeneratePackageOnBuild>True</GeneratePackageOnBuild> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|AnyCPU'"> - <DebugSymbols>true</DebugSymbols> - <OutputPath>bin\Test\</OutputPath> - <DefineConstants>DEBUG;TRACE;TEST</DefineConstants> - <DebugType>full</DebugType> - <PlatformTarget>anycpu</PlatformTarget> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemGroup> - <Compile Include="AutofacExtensions.cs" /> - <Compile Include="IPlatformInitializer.cs" /> - <Compile Include="Modularity\AutofacModuleInitializer.cs" /> - <Compile Include="Navigation\AutofacPageNavigationService.cs" /> - <Compile Include="PrismApplication.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\Prism\Prism.csproj"> - <Project>{e6c50355-d01e-4caa-884d-d7929861315c}</Project> - <Name>Prism</Name> - </ProjectReference> - <ProjectReference Include="..\Prism.Forms\Prism.Forms.csproj"> - <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project> - <Name>Prism.Forms</Name> - </ProjectReference> - </ItemGroup> + <ItemGroup> - <Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Autofac.3.5.2\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Autofac.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath> - <Private>True</Private> - </Reference> + <PackageReference Include="Autofac" Version="4.5.0" /> </ItemGroup> + <ItemGroup> - <None Include="packages.config" /> + <ProjectReference Include="../Prism.Forms/Prism.Forms.csproj" /> </ItemGroup> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <Import Project="..\..\packages\Xamarin.Forms.2.2.0.45\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.2.0.45\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" /> - <Import Project="..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> - </Target> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project>
\ No newline at end of file + +</Project> diff --git a/Source/Xamarin/Prism.Autofac.Forms/Properties/AssemblyInfo.cs b/Source/Xamarin/Prism.Autofac.Forms/Properties/AssemblyInfo.cs deleted file mode 100644 index 5963a4b..0000000 --- a/Source/Xamarin/Prism.Autofac.Forms/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Prism.Autofac.Forms")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Prism.Autofac.Forms")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] diff --git a/Source/Xamarin/Prism.Autofac.Forms/packages.config b/Source/Xamarin/Prism.Autofac.Forms/packages.config deleted file mode 100644 index 375defb..0000000 --- a/Source/Xamarin/Prism.Autofac.Forms/packages.config +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Autofac" version="3.5.2" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="portable45-net45+win8+wp8+wpa81" /> -</packages>
\ No newline at end of file diff --git a/Source/Xamarin/Prism.DI.Forms.Tests/Prism.DI.Forms.Tests.projitems b/Source/Xamarin/Prism.DI.Forms.Tests/Prism.DI.Forms.Tests.projitems deleted file mode 100644 index 89df5d7..0000000 --- a/Source/Xamarin/Prism.DI.Forms.Tests/Prism.DI.Forms.Tests.projitems +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> - <HasSharedItems>true</HasSharedItems> - <SharedGUID>{7E004833-51E6-4C9A-9742-62D604F04642}</SharedGUID> - </PropertyGroup> - <PropertyGroup Label="Configuration"> - <Import_RootNamespace>Prism.DI.Forms.Tests</Import_RootNamespace> - </PropertyGroup> - <ItemGroup> - <Compile Include="$(MSBuildThisFileDirectory)ConcreteTypeMock.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Mocks\Modules\ModuleMock.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Mocks\Services\DependencyServiceMock.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Mocks\Services\IDependencyServiceMock.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Mocks\Services\IServiceMock.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Mocks\Services\ServiceMock.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Mocks\ViewModels\AutowireViewModel.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Mocks\ViewModels\ConstructorArgumentViewModel.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Mocks\ViewModels\ViewModelAMock.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Mocks\ViewModels\ViewModelBMock.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Mocks\Views\AutowireView.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Mocks\Views\ConstructorArgumentView.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Mocks\Views\ViewAMock.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Mocks\Views\ViewMock.cs" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/Source/Xamarin/Prism.DI.Forms.Tests/Prism.DI.Forms.Tests.shproj b/Source/Xamarin/Prism.DI.Forms.Tests/Prism.DI.Forms.Tests.shproj deleted file mode 100644 index 296e10b..0000000 --- a/Source/Xamarin/Prism.DI.Forms.Tests/Prism.DI.Forms.Tests.shproj +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <ProjectGuid>{7E004833-51E6-4C9A-9742-62D604F04642}</ProjectGuid> - </PropertyGroup> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" /> - <Import Project="Prism.DI.Forms.Tests.projitems" Label="Shared" /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" /> -</Project>
\ No newline at end of file diff --git a/Source/Xamarin/Prism.DryIoc.Forms.Tests/Prism.DryIoc.Forms.Tests.csproj b/Source/Xamarin/Prism.DryIoc.Forms.Tests/Prism.DryIoc.Forms.Tests.csproj index 302db82..1fe2781 100644 --- a/Source/Xamarin/Prism.DryIoc.Forms.Tests/Prism.DryIoc.Forms.Tests.csproj +++ b/Source/Xamarin/Prism.DryIoc.Forms.Tests/Prism.DryIoc.Forms.Tests.csproj @@ -1,126 +1,32 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" /> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{1D1B893C-3F38-436F-A507-D65310B9D2A0}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> + <TargetFramework>netcoreapp1.1</TargetFramework> + <OutputType>Exe</OutputType> + <PackageTargetFallback>$(PackageTargetFallback);portable-win+net45+wp8+win81+wpa8</PackageTargetFallback> <RootNamespace>Prism.DryIoc.Forms.Tests</RootNamespace> <AssemblyName>Prism.DryIoc.Forms.Tests</AssemblyName> - <DefaultLanguage>en-US</DefaultLanguage> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <TargetFrameworkProfile>Profile259</TargetFrameworkProfile> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|AnyCPU'"> - <DebugSymbols>true</DebugSymbols> - <OutputPath>bin\Test\</OutputPath> - <DefineConstants>TRACE;DEBUG;TEST</DefineConstants> - <DebugType>full</DebugType> - <PlatformTarget>AnyCPU</PlatformTarget> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemGroup> - <!-- A reference to the entire .NET Framework is automatically included --> - <ProjectReference Include="..\..\Prism\Prism.csproj"> - <Project>{E6C50355-D01E-4CAA-884D-D7929861315C}</Project> - <Name>Prism</Name> - </ProjectReference> - <ProjectReference Include="..\Prism.DryIoc.Forms\Prism.DryIoc.Forms.csproj"> - <Project>{174f4add-b9c7-4f5e-a96d-f53ff3ecbe9b}</Project> - <Name>Prism.DryIoc.Forms</Name> - </ProjectReference> - <ProjectReference Include="..\Prism.Forms\Prism.Forms.csproj"> - <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project> - <Name>Prism.Forms</Name> - </ProjectReference> - </ItemGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'" /> + <ItemGroup> - <Compile Include="Mocks\PrismApplicationMock.cs" /> - <Compile Include="PrismApplicationFixture.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" /> + <PackageReference Include="xunit" Version="2.3.0-beta1-build3642" /> + <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1309" /> </ItemGroup> + <ItemGroup> - <Reference Include="DryIoc, Version=2.10.1.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\DryIoc.dll.2.10.1\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\DryIoc.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.execution.dotnet, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.execution.dotnet.dll</HintPath> - <Private>True</Private> - </Reference> + <ProjectReference Include="..\Prism.DryIoc.Forms\Prism.DryIoc.Forms.csproj" /> </ItemGroup> + <ItemGroup> - <None Include="packages.config" /> + <Compile Include="../Prism.DI.Forms.Tests/**/*.cs" /> </ItemGroup> + <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> </ItemGroup> - <ItemGroup /> - <Import Project="..\Prism.DI.Forms.Tests\Prism.DI.Forms.Tests.projitems" Label="Shared" /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props'))" /> - <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> - </Target> - <Import Project="..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> + </Project>
\ No newline at end of file diff --git a/Source/Xamarin/Prism.DryIoc.Forms.Tests/Properties/AssemblyInfo.cs b/Source/Xamarin/Prism.DryIoc.Forms.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 0fb9d9c..0000000 --- a/Source/Xamarin/Prism.DryIoc.Forms.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Resources; -using System.Reflection; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Prism.DryIoc.Forms.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Prism.DryIoc.Forms.Tests")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Source/Xamarin/Prism.DryIoc.Forms.Tests/packages.config b/Source/Xamarin/Prism.DryIoc.Forms.Tests/packages.config deleted file mode 100644 index 663ea2c..0000000 --- a/Source/Xamarin/Prism.DryIoc.Forms.Tests/packages.config +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="DryIoc.dll" version="2.10.1" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Collections" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Linq" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Linq.Expressions" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Reflection" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Runtime" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Threading" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="xunit" version="2.1.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="xunit.abstractions" version="2.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="xunit.assert" version="2.1.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="xunit.core" version="2.1.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="xunit.extensibility.core" version="2.1.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> -</packages>
\ No newline at end of file diff --git a/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj b/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj index 235ac7a..c9dff07 100644 --- a/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj +++ b/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj @@ -1,104 +1,46 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{174F4ADD-B9C7-4F5E-A96D-F53FF3ECBE9B}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Prism.DryIoc</RootNamespace> + <TargetFrameworks>netstandard1.0;</TargetFrameworks> <AssemblyName>Prism.DryIoc.Forms</AssemblyName> - <DefaultLanguage>en-US</DefaultLanguage> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <TargetFrameworkProfile>Profile259</TargetFrameworkProfile> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> + <PackageId>Prism.DryIoc.Forms</PackageId> + <Title>DryIoc for Prism for Xamarin.Forms</Title> + <NeutralLanguage>en</NeutralLanguage> + <!-- Summary is not actually supported at this time. Including the summary for future support. --> + <!--<Summary>DryIoc extensions for Prism for Xamarin.Forms.</Summary>--> + <Description>Use these extensions to build Xamarin.Forms applications with Prism and DryIoc.</Description> + <PackageTags>prism;xamarin;xamarin.forms;dryioc;dependency injection</PackageTags> + <Authors>Brian Lagunas;Brian Noyes</Authors> + <Owners>Brian Lagunas;Brian Noyes</Owners> + <PackageIconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</PackageIconUrl> + <PackageProjectUrl>https://github.com/PrismLibrary/Prism</PackageProjectUrl> + <PackageLicenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</PackageLicenseUrl> + <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> + <RepositoryType>git</RepositoryType> + <RepositoryUrl>https://github.com/PrismLibrary/Prism</RepositoryUrl> + <PackageOutputPath>../../Build</PackageOutputPath> + <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version> + <!-- Update this version when incrementing Library Versions i.e. 7.1.0, 7.2.0 --> + <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' ">7.0.0</VersionPrefix> + <!-- This will create CI builds as 7.0.0-ci1234 --> + <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">ci$(APPVEYOR_BUILD_NUMBER)</VersionSuffix> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'"> + <DefineConstants>$(DefineConstants);DEBUG</DefineConstants> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <DocumentationFile>bin\Release\Prism.DryIoc.Forms.XML</DocumentationFile> + + <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> + <GenerateDocumentationFile>True</GenerateDocumentationFile> + <GeneratePackageOnBuild>True</GeneratePackageOnBuild> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|AnyCPU'"> - <DebugSymbols>true</DebugSymbols> - <OutputPath>bin\Test\</OutputPath> - <DefineConstants>DEBUG;TRACE;TEST;</DefineConstants> - <DebugType>full</DebugType> - <PlatformTarget>anycpu</PlatformTarget> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemGroup> - <Compile Include="DryIocExtensions.cs" /> - <Compile Include="Extensions\UnknownServiceResolverRule.cs" /> - <Compile Include="IPlatformInitializer.cs" /> - <Compile Include="Modularity\DryIocModuleInitializer.cs" /> - <Compile Include="Navigation\DryIocPageNavigationService.cs" /> - <Compile Include="PrismApplication.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\Prism\Prism.csproj"> - <Project>{E6C50355-D01E-4CAA-884D-D7929861315C}</Project> - <Name>Prism</Name> - </ProjectReference> - <ProjectReference Include="..\Prism.Forms\Prism.Forms.csproj"> - <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project> - <Name>Prism.Forms</Name> - </ProjectReference> - </ItemGroup> + <ItemGroup> - <Reference Include="DryIoc, Version=2.10.1.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\DryIoc.dll.2.10.1\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\DryIoc.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath> - <Private>True</Private> - </Reference> + <PackageReference Include="DryIoc.dll" Version="2.10.6" /> </ItemGroup> + <ItemGroup> - <None Include="packages.config" /> + <ProjectReference Include="../Prism.Forms/Prism.Forms.csproj" /> </ItemGroup> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <Import Project="..\..\packages\Xamarin.Forms.2.1.0.6529\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.1.0.6529\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" /> - <Import Project="..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> - </Target> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project>
\ No newline at end of file + +</Project> diff --git a/Source/Xamarin/Prism.DryIoc.Forms/Properties/AssemblyInfo.cs b/Source/Xamarin/Prism.DryIoc.Forms/Properties/AssemblyInfo.cs deleted file mode 100644 index d4617f4..0000000 --- a/Source/Xamarin/Prism.DryIoc.Forms/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly: AssemblyTitle("Prism.DryIoc.Forms")] -[assembly: AssemblyDescription("Prism.Forms using DryIoc")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Prism.DryIoc.Forms")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0.1")] -[assembly: AssemblyInformationalVersion("6.3.0.1")]
\ No newline at end of file diff --git a/Source/Xamarin/Prism.DryIoc.Forms/packages.config b/Source/Xamarin/Prism.DryIoc.Forms/packages.config deleted file mode 100644 index 6e236f0..0000000 --- a/Source/Xamarin/Prism.DryIoc.Forms/packages.config +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="DryIoc.dll" version="2.10.1" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Collections" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Linq" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Linq.Expressions" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Reflection" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Runtime" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="System.Threading" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="portable45-net45+win8+wp8+wpa81" /> -</packages>
\ No newline at end of file diff --git a/Source/Xamarin/Prism.Forms.Tests/Prism.Forms.Tests.csproj b/Source/Xamarin/Prism.Forms.Tests/Prism.Forms.Tests.csproj index 59df875..2023513 100644 --- a/Source/Xamarin/Prism.Forms.Tests/Prism.Forms.Tests.csproj +++ b/Source/Xamarin/Prism.Forms.Tests/Prism.Forms.Tests.csproj @@ -1,146 +1,26 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" /> - <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.visualstudio.props')" /> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{DD171BA8-7B2D-4722-B5BF-E0A9EBFA1D5F}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Prism.Forms.Tests</RootNamespace> - <AssemblyName>Prism.Forms.Tests</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <TargetFrameworkProfile>Profile78</TargetFrameworkProfile> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> + <TargetFramework>netcoreapp1.1</TargetFramework> + <PackageTargetFallback>$(PackageTargetFallback);portable-win+net45+wp8+win81+wpa8</PackageTargetFallback> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'"> + <DefineConstants>$(DefineConstants);DEBUG</DefineConstants> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|AnyCPU'"> - <OutputPath>bin\Test\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <Optimize>true</Optimize> - <DebugType>pdbonly</DebugType> - <PlatformTarget>AnyCPU</PlatformTarget> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemGroup> - <Compile Include="Common\PageUtilitiesFixture.cs" /> - <Compile Include="Mocks\IPageNavigationEventRecordable.cs" /> - <Compile Include="Mocks\PageNavigationEvent.cs" /> - <Compile Include="Mocks\PageNavigationRecord.cs" /> - <Compile Include="Mocks\PageNavigationEventRecorder.cs" /> - <Compile Include="Navigation\PageNavigationInfoFixture.cs" /> - <Compile Include="Navigation\PageNavigationRegistryFixture.cs" /> - <Compile Include="Behaviors\EventToCommandBehaviorFixture.cs" /> - <Compile Include="Common\UriParsingHelperFixture.cs" /> - <Compile Include="Mocks\ApplicationProviderMock.cs" /> - <Compile Include="Mocks\Behaviors\EventToCommandBehaviorMock.cs" /> - <Compile Include="Mocks\PageNavigationContainerMock.cs" /> - <Compile Include="Mocks\PageNavigationServiceMock.cs" /> - <Compile Include="Mocks\PageDialogServiceMock.cs" /> - <Compile Include="Mocks\ViewModels\CarouselPageMockViewModel.cs" /> - <Compile Include="Mocks\ViewModels\ContentPageMockViewModel.cs" /> - <Compile Include="Mocks\ViewModels\MasterDetailPageMockViewModel.cs" /> - <Compile Include="Mocks\ViewModels\NavigationPageMockViewModel.cs" /> - <Compile Include="Mocks\ViewModels\TabbedPageMockViewModel.cs" /> - <Compile Include="Mocks\ViewModels\ViewModelBase.cs" /> - <Compile Include="Mocks\Views\CarouselPageMock.cs" /> - <Compile Include="Mocks\Views\ContentPageMock.cs" /> - <Compile Include="Mocks\Views\MasterDetailPageMock.cs" /> - <Compile Include="Mocks\Views\NavigationPageMock.cs" /> - <Compile Include="Mocks\Views\PageMock.cs" /> - <Compile Include="Mocks\ViewModels\PageMockViewModel.cs" /> - <Compile Include="Mocks\Views\TabbedPageMock.cs" /> - <Compile Include="Mvvm\ViewModelLocatorFixture.cs" /> - <Compile Include="Navigation\NavigationParametersFixture.cs" /> - <Compile Include="Navigation\PageNavigationServiceFixture.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Services\PageDialogServiceFixture.cs" /> - </ItemGroup> - <ItemGroup> - <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.execution.dotnet, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.execution.dotnet.dll</HintPath> - <Private>True</Private> - </Reference> - </ItemGroup> + <ItemGroup> - <None Include="packages.config" /> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" /> + <PackageReference Include="xunit" Version="2.2.0" /> + <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" /> </ItemGroup> + <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + <ProjectReference Include="../Prism.Forms/Prism.Forms.csproj" /> </ItemGroup> + <ItemGroup> - <ProjectReference Include="..\..\Prism\Prism.csproj"> - <Project>{e6c50355-d01e-4caa-884d-d7929861315c}</Project> - <Name>Prism</Name> - </ProjectReference> - <ProjectReference Include="..\Prism.Forms\Prism.Forms.csproj"> - <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project> - <Name>Prism.Forms</Name> - </ProjectReference> + <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> </ItemGroup> - <ItemGroup /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.visualstudio.props'))" /> - <Error Condition="!Exists('..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props'))" /> - <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> - </Target> - <Import Project="..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project>
\ No newline at end of file + +</Project> diff --git a/Source/Xamarin/Prism.Forms.Tests/Properties/AssemblyInfo.cs b/Source/Xamarin/Prism.Forms.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 077b713..0000000 --- a/Source/Xamarin/Prism.Forms.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Xunit; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Prism.Forms.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Prism.Forms.Tests")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] - -[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file diff --git a/Source/Xamarin/Prism.Forms.Tests/packages.config b/Source/Xamarin/Prism.Forms.Tests/packages.config deleted file mode 100644 index 8d4b623..0000000 --- a/Source/Xamarin/Prism.Forms.Tests/packages.config +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="portable45-net45+win8+wp8" /> - <package id="xunit" version="2.1.0" targetFramework="portable45-net45+win8+wp8" /> - <package id="xunit.abstractions" version="2.0.0" targetFramework="portable45-net45+win8+wp8" /> - <package id="xunit.assert" version="2.1.0" targetFramework="portable45-net45+win8+wp8" /> - <package id="xunit.core" version="2.1.0" targetFramework="portable45-net45+win8+wp8" /> - <package id="xunit.extensibility.core" version="2.1.0" targetFramework="portable45-net45+win8+wp8" /> - <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="portable45-net45+win8+wp8" /> - <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="portable45-net45+win8+wp8" /> -</packages>
\ No newline at end of file diff --git a/Source/Xamarin/Prism.Forms/Prism.Forms.csproj b/Source/Xamarin/Prism.Forms/Prism.Forms.csproj index 7b7fd73..2a5f299 100644 --- a/Source/Xamarin/Prism.Forms/Prism.Forms.csproj +++ b/Source/Xamarin/Prism.Forms/Prism.Forms.csproj @@ -1,152 +1,46 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Prism</RootNamespace> + <TargetFrameworks>netstandard1.0;</TargetFrameworks> <AssemblyName>Prism.Forms</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <TargetFrameworkProfile>Profile259</TargetFrameworkProfile> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> - <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion> + <PackageId>Prism.Forms</PackageId> + <Title>Prism for Xamarin.Forms</Title> + <NeutralLanguage>en-US</NeutralLanguage> + <!-- Summary is not actually supported at this time. Including the summary for future support. --> + <!--<Summary>Prism for Xamarin.Forms helps you more easily design and build rich, flexible, and easy to maintain Xamarin.Forms applications.</Summary>--> + <Description>Prism provides an implementation of a collection of design patterns that are helpful in writing well structured and maintainable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared code base in a Portable Class Library targeting these platforms; WPF, Windows 10 UWP, and Xamarin Forms. Features that need to be platform specific are implemented in the respective libraries for the target platform. Prism for Xamarin.Forms helps you more easily design and build rich, flexible, and easy to maintain Xamarin.Forms applications.</Description> + <PackageTags>prism;xamarin;xamarin.forms;mvvm;uwp;ios;android;xaml</PackageTags> + <Authors>Brian Lagunas;Brian Noyes</Authors> + <Owners>Brian Lagunas;Brian Noyes</Owners> + <PackageIconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</PackageIconUrl> + <PackageProjectUrl>https://github.com/PrismLibrary/Prism</PackageProjectUrl> + <PackageLicenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</PackageLicenseUrl> + <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> + <RepositoryType>git</RepositoryType> + <RepositoryUrl>https://github.com/PrismLibrary/Prism</RepositoryUrl> + <PackageOutputPath>../../Build</PackageOutputPath> + <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version> + <!-- Update this version when incrementing Library Versions i.e. 7.1.0, 7.2.0 --> + <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' ">7.0.0</VersionPrefix> + <!-- This will create CI builds as 7.0.0-ci1234 --> + <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">ci$(APPVEYOR_BUILD_NUMBER)</VersionSuffix> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <SignAssembly>false</SignAssembly> + + <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> + <GenerateDocumentationFile>True</GenerateDocumentationFile> + <GeneratePackageOnBuild>True</GeneratePackageOnBuild> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <SignAssembly>false</SignAssembly> - <DocumentationFile>bin\Release\Prism.Forms.xml</DocumentationFile> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'"> + <DefineConstants>$(DefineConstants);DEBUG</DefineConstants> </PropertyGroup> - <PropertyGroup> - <AssemblyOriginatorKeyFile>..\..\prism.pfx</AssemblyOriginatorKeyFile> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|AnyCPU'"> - <OutputPath>bin\Test\</OutputPath> - <DefineConstants>TRACE;TEST</DefineConstants> - <DocumentationFile>bin\Release\Prism.Forms.xml</DocumentationFile> - <Optimize>false</Optimize> - <DebugType>pdbonly</DebugType> - <PlatformTarget>AnyCPU</PlatformTarget> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemGroup> - <Compile Include="AppModel\IApplicationLifecycle.cs" /> - <Compile Include="AppModel\RuntimePlatform.cs" /> - <Compile Include="Behaviors\BehaviorBase{T}.cs" /> - <Compile Include="Behaviors\CarouselPageActiveAwareBehavior.cs" /> - <Compile Include="Behaviors\NavigationPageSystemGoBackBehavior.cs" /> - <Compile Include="Behaviors\TabbedPageActiveAwareBehavior.cs" /> - <Compile Include="Behaviors\MultiPageActiveAwareBehavior{T}.cs" /> - <Compile Include="Navigation\IDestructible.cs" /> - <Compile Include="Navigation\INavigatedAware.cs" /> - <Compile Include="Navigation\INavigatingAware.cs" /> - <Compile Include="Navigation\KnownNavigationParameters.cs" /> - <Compile Include="Navigation\NavigationMode.cs" /> - <Compile Include="Navigation\NavigationParametersExtensions.cs" /> - <Compile Include="Navigation\PageNavigationSource.cs" /> - <Compile Include="Common\PageUtilities.cs" /> - <Compile Include="Behaviors\EventToCommandBehavior.cs" /> - <Compile Include="IPlatformInitializer.cs" /> - <Compile Include="Navigation\INavigationPageOptions.cs" /> - <Compile Include="Platform{T}.cs" /> - <Compile Include="PrismApplicationBase.cs" /> - <Compile Include="Common\ApplicationProvider.cs" /> - <Compile Include="Common\IApplicationProvider.cs" /> - <Compile Include="Navigation\IMasterDetailPageOptions.cs" /> - <Compile Include="Navigation\PageNavigationInfo.cs" /> - <Compile Include="Navigation\PageNavigationRegistry.cs" /> - <Compile Include="Common\UriParsingHelper.cs" /> - <Compile Include="FormsApplication.cs" /> - <Compile Include="Modularity\IModule.cs" /> - <Compile Include="Modularity\IModuleCatalog.cs" /> - <Compile Include="Modularity\IModuleInitializer.cs" /> - <Compile Include="Modularity\IModuleManager.cs" /> - <Compile Include="Modularity\InitializationMode.cs" /> - <Compile Include="Modularity\ModuleCatalog.cs" /> - <Compile Include="Modularity\ModuleInfo.cs" /> - <Compile Include="Modularity\ModuleManager.cs" /> - <Compile Include="Modularity\ModuleState.cs" /> - <Compile Include="Mvvm\ViewModelLocator.cs" /> - <Compile Include="Navigation\IConfirmNavigation.cs" /> - <Compile Include="Navigation\IConfirmNavigationAsync.cs" /> - <Compile Include="Navigation\INavigationAware.cs" /> - <Compile Include="Navigation\INavigationService.cs" /> - <Compile Include="Common\IPageAware.cs" /> - <Compile Include="Navigation\NavigationParameters.cs" /> - <Compile Include="Navigation\PageNavigationService.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Services\DeviceService.cs" /> - <Compile Include="Services\IDeviceService.cs" /> - <Compile Include="Services\DependencyService.cs" /> - <Compile Include="Services\PageDialogService\ActionSheetButtonBase.cs" /> - <Compile Include="Services\PageDialogService\ActionSheetButton.cs" /> - <Compile Include="Services\PageDialogService\ActionSheetButton{T}.cs" /> - <Compile Include="Services\PageDialogService\IActionSheetButton.cs" /> - <Compile Include="Services\IDependencyService.cs" /> - <Compile Include="Services\PageDialogService\IPageDialogService.cs" /> - <Compile Include="Services\PageDialogService\PageDialogService.cs" /> - <Compile Include="AppModel\IApplicationStore.cs" /> - <Compile Include="AppModel\ApplicationStore.cs" /> - <Compile Include="FormsDependencyService.cs" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\Prism\Prism.csproj"> - <Project>{e6c50355-d01e-4caa-884d-d7929861315c}</Project> - <Name>Prism</Name> - </ProjectReference> - </ItemGroup> + <ItemGroup> - <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath> - <Private>True</Private> - </Reference> + <PackageReference Include="Xamarin.Forms" Version="2.3.5.239-pre3" /> </ItemGroup> + <ItemGroup> - <None Include="packages.config" /> + <ProjectReference Include="..\..\Prism\Prism.csproj" /> </ItemGroup> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <Import Project="..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> - </Target> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project>
\ No newline at end of file + +</Project> diff --git a/Source/Xamarin/Prism.Forms/Properties/AssemblyInfo.cs b/Source/Xamarin/Prism.Forms/Properties/AssemblyInfo.cs deleted file mode 100644 index 65d11f1..0000000 --- a/Source/Xamarin/Prism.Forms/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Prism.Forms")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Prism")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] diff --git a/Source/Xamarin/Prism.Forms/packages.config b/Source/Xamarin/Prism.Forms/packages.config deleted file mode 100644 index 33c4845..0000000 --- a/Source/Xamarin/Prism.Forms/packages.config +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="portable45-net45+win8+wp8+wpa81" /> -</packages>
\ No newline at end of file diff --git a/Source/Xamarin/Prism.Ninject.Forms/Extensions/DependencyServiceBindingResolver.cs b/Source/Xamarin/Prism.Ninject.Forms/Extensions/DependencyServiceBindingResolver.cs index 9c1e247..94651ab 100644 --- a/Source/Xamarin/Prism.Ninject.Forms/Extensions/DependencyServiceBindingResolver.cs +++ b/Source/Xamarin/Prism.Ninject.Forms/Extensions/DependencyServiceBindingResolver.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using Ninject.Activation; -using Ninject.Infrastructure; using Ninject.Planning.Bindings; using Ninject.Components; @@ -18,7 +17,7 @@ namespace Prism.Ninject.Extensions public class DependencyServiceBindingResolver : NinjectComponent, IMissingBindingResolver { /// <inheritDoc /> - public IEnumerable<IBinding> Resolve(Multimap<Type, IBinding> bindings, IRequest request) + public IEnumerable<IBinding> Resolve(IDictionary<Type, IEnumerable<IBinding>> bindings, IRequest request) { var service = request.Service; if (!service.GetTypeInfo().IsInterface) diff --git a/Source/Xamarin/Prism.Ninject.Forms/Prism.Ninject.Forms.csproj b/Source/Xamarin/Prism.Ninject.Forms/Prism.Ninject.Forms.csproj index b4f99e1..5f936e3 100644 --- a/Source/Xamarin/Prism.Ninject.Forms/Prism.Ninject.Forms.csproj +++ b/Source/Xamarin/Prism.Ninject.Forms/Prism.Ninject.Forms.csproj @@ -1,111 +1,48 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{F8424F1D-A7BF-4113-AF23-0F0A7BE6BBB1}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Prism.Ninject</RootNamespace> + <!-- Targeting netstandard1.3 & netstandard1.5 to match Ninject --> + <TargetFrameworks>netstandard1.3;netstandard1.5;</TargetFrameworks> <AssemblyName>Prism.Ninject.Forms</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <TargetFrameworkProfile>Profile259</TargetFrameworkProfile> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> - <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion> + <PackageId>Prism.Ninject.Forms</PackageId> + <Title>Ninject for Prism for Xamarin.Forms</Title> + <NeutralLanguage>en-US</NeutralLanguage> + <!-- Summary is not actually supported at this time. Including the summary for future support. --> + <!--<Summary>Ninject extensions for Prism for Xamarin.Forms.</Summary>--> + <Description>Use these extensions to build Xamarin.Forms applications with Prism and Ninject.</Description> + <PackageTags>prism;xamarin;xamarin.forms;ninject;dependency injection</PackageTags> + <Authors>Brian Lagunas;Brian Noyes</Authors> + <Owners>Brian Lagunas;Brian Noyes</Owners> + <PackageIconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</PackageIconUrl> + <PackageProjectUrl>https://github.com/PrismLibrary/Prism</PackageProjectUrl> + <PackageLicenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</PackageLicenseUrl> + <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> + <RepositoryType>git</RepositoryType> + <RepositoryUrl>https://github.com/PrismLibrary/Prism</RepositoryUrl> + <PackageOutputPath>../../Build</PackageOutputPath> + <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version> + <!-- Update this version when incrementing Library Versions i.e. 7.1.0, 7.2.0 --> + <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' ">7.0.0</VersionPrefix> + <!-- This will create CI builds as 7.0.0-ci1234 --> + <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">ci$(APPVEYOR_BUILD_NUMBER)</VersionSuffix> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <SignAssembly>false</SignAssembly> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'"> + <DefineConstants>$(DefineConstants);DEBUG</DefineConstants> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <SignAssembly>false</SignAssembly> - <DocumentationFile>bin\Release\Prism.Ninject.Forms.xml</DocumentationFile> + + <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> + <GenerateDocumentationFile>True</GenerateDocumentationFile> + <GeneratePackageOnBuild>True</GeneratePackageOnBuild> </PropertyGroup> - <PropertyGroup> - <AssemblyOriginatorKeyFile>..\..\prism.pfx</AssemblyOriginatorKeyFile> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|AnyCPU'"> - <OutputPath>bin\Test\</OutputPath> - <DefineConstants>DEBUG;TRACE;TEST;</DefineConstants> - <DocumentationFile>bin\Release\Prism.Ninject.Forms.xml</DocumentationFile> - <Optimize>true</Optimize> - <DebugType> - </DebugType> - <PlatformTarget>anycpu</PlatformTarget> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemGroup> - <Compile Include="Extensions\DependencyServiceBindingResolver.cs" /> - <Compile Include="Extensions\DependencyServiceProvider.cs" /> - <Compile Include="IPlatformInitializer.cs" /> - <Compile Include="Modularity\NinjectModuleInitializer.cs" /> - <Compile Include="Navigation\NinjectPageNavigationService.cs" /> - <Compile Include="PrismApplication.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="NinjectExtensions.cs" /> - </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> + <ItemGroup> - <ProjectReference Include="..\..\Prism\Prism.csproj"> - <Project>{e6c50355-d01e-4caa-884d-d7929861315c}</Project> - <Name>Prism</Name> - </ProjectReference> - <ProjectReference Include="..\Prism.Forms\Prism.Forms.csproj"> - <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project> - <Name>Prism.Forms</Name> - </ProjectReference> + <PackageReference Include="Ninject" Version="4.0.0-beta-0134" /> </ItemGroup> + <ItemGroup> - <Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Portable.Ninject.3.3.1\lib\portable-net4+sl5+wp8+win8+wpa81+monotouch+monoandroid+Xamarin.iOS\Ninject.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath> - <Private>True</Private> - </Reference> + <ProjectReference Include="../Prism.Forms/Prism.Forms.csproj" /> </ItemGroup> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <Import Project="..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> - </Target> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project>
\ No newline at end of file + +</Project> diff --git a/Source/Xamarin/Prism.Ninject.Forms/Properties/AssemblyInfo.cs b/Source/Xamarin/Prism.Ninject.Forms/Properties/AssemblyInfo.cs deleted file mode 100644 index 11bf30d..0000000 --- a/Source/Xamarin/Prism.Ninject.Forms/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Prism.Ninject.Forms")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Prism.Ninject.Forms")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] diff --git a/Source/Xamarin/Prism.Ninject.Forms/packages.config b/Source/Xamarin/Prism.Ninject.Forms/packages.config deleted file mode 100644 index cca27f1..0000000 --- a/Source/Xamarin/Prism.Ninject.Forms/packages.config +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Portable.Ninject" version="3.3.1" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="portable45-net45+win8+wp8+wpa81" /> -</packages>
\ No newline at end of file diff --git a/Source/Xamarin/Prism.Unity.Forms.Tests/Prism.Unity.Forms.Tests.csproj b/Source/Xamarin/Prism.Unity.Forms.Tests/Prism.Unity.Forms.Tests.csproj index 7de4ef7..53825c7 100644 --- a/Source/Xamarin/Prism.Unity.Forms.Tests/Prism.Unity.Forms.Tests.csproj +++ b/Source/Xamarin/Prism.Unity.Forms.Tests/Prism.Unity.Forms.Tests.csproj @@ -1,107 +1,32 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\Prism.DI.Forms.Tests\Prism.DI.Forms.Tests.projitems" Label="Shared" Condition="Exists('..\Prism.DI.Forms.Tests\Prism.DI.Forms.Tests.projitems')" /> - <Import Project="..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" /> +<?xml version="1.0" encoding="utf-8"?> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{2B5E37A2-B719-478A-A513-FBFA08F7EED6}</ProjectGuid> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <OutputType>Library</OutputType> + <TargetFramework>netcoreapp1.1</TargetFramework> + <OutputType>Exe</OutputType> + <PackageTargetFallback>$(PackageTargetFallback);portable-win+net45+wp8+win81+wpa8</PackageTargetFallback> <RootNamespace>Prism.Unity.Forms.Tests</RootNamespace> <AssemblyName>Prism.Unity.Forms.Tests</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <TargetFrameworkProfile>Profile259</TargetFrameworkProfile> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug</OutputPath> - <DefineConstants>DEBUG;TRACE;</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <Optimize>true</Optimize> - <OutputPath>bin\Release</OutputPath> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Test|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Test</OutputPath> - <DefineConstants>DEBUG;TRACE;TEST</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <ItemGroup> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="PrismApplicationFixture.cs" /> - <Compile Include="Mocks\PrismApplicationMock.cs" /> - </ItemGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'" /> + <ItemGroup> - <Reference Include="Microsoft.Practices.ServiceLocation"> - <HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath> - </Reference> - <Reference Include="Microsoft.Practices.Unity"> - <HintPath>..\..\packages\Unity.4.0.1\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.abstractions"> - <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath> - </Reference> - <Reference Include="xunit.assert"> - <HintPath>..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath> - </Reference> - <Reference Include="xunit.core"> - <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll</HintPath> - </Reference> - <Reference Include="xunit.execution.dotnet"> - <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.execution.dotnet.dll</HintPath> - </Reference> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" /> + <PackageReference Include="xunit" Version="2.3.0-beta1-build3642" /> + <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1309" /> </ItemGroup> + <ItemGroup> - <None Include="packages.config" /> + <ProjectReference Include="..\Prism.Unity.Forms\Prism.Unity.Forms.csproj" /> </ItemGroup> + <ItemGroup> - <ProjectReference Include="..\..\Prism\Prism.csproj"> - <Project>{E6C50355-D01E-4CAA-884D-D7929861315C}</Project> - <Name>Prism</Name> - </ProjectReference> - <ProjectReference Include="..\Prism.Forms\Prism.Forms.csproj"> - <Project>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</Project> - <Name>Prism.Forms</Name> - </ProjectReference> - <ProjectReference Include="..\Prism.Unity.Forms\Prism.Unity.Forms.csproj"> - <Project>{79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}</Project> - <Name>Prism.Unity.Forms</Name> - </ProjectReference> + <Compile Include="../Prism.DI.Forms.Tests/**/*.cs" /> </ItemGroup> + <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> </ItemGroup> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <Import Project="..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> - </Target> + </Project>
\ No newline at end of file diff --git a/Source/Xamarin/Prism.Unity.Forms.Tests/Properties/AssemblyInfo.cs b/Source/Xamarin/Prism.Unity.Forms.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 125293c..0000000 --- a/Source/Xamarin/Prism.Unity.Forms.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle( "Prism.Unity.Forms.Tests" )] -[assembly: AssemblyDescription( "" )] -[assembly: AssemblyConfiguration( "" )] -[assembly: AssemblyCompany( "AvantiPoint, LLC" )] -[assembly: AssemblyProduct( "" )] -[assembly: AssemblyCopyright( "Copyright © AvantiPoint 2017" )] -[assembly: AssemblyTrademark( "" )] -[assembly: AssemblyCulture( "" )] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion( "1.0.*" )] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/Source/Xamarin/Prism.Unity.Forms.Tests/packages.config b/Source/Xamarin/Prism.Unity.Forms.Tests/packages.config deleted file mode 100644 index b30d994..0000000 --- a/Source/Xamarin/Prism.Unity.Forms.Tests/packages.config +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="CommonServiceLocator" version="1.3" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="Unity" version="4.0.1" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="xunit" version="2.1.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="xunit.abstractions" version="2.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="xunit.assert" version="2.1.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="xunit.core" version="2.1.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="xunit.extensibility.core" version="2.1.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="portable45-net45+win8+wp8+wpa81" /> -</packages>
\ No newline at end of file diff --git a/Source/Xamarin/Prism.Unity.Forms/Prism.Unity.Forms.csproj b/Source/Xamarin/Prism.Unity.Forms/Prism.Unity.Forms.csproj index 5076fc1..220afaf 100644 --- a/Source/Xamarin/Prism.Unity.Forms/Prism.Unity.Forms.csproj +++ b/Source/Xamarin/Prism.Unity.Forms/Prism.Unity.Forms.csproj @@ -1,115 +1,48 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{79EBB8F1-5D80-4EA1-9100-EBDC1EC51CB7}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Prism.Unity</RootNamespace> + <TargetFrameworks>netstandard1.0;</TargetFrameworks> + <PackageTargetFallback>$(PackageTargetFallback);portable-win+net45+wp8+win81+wpa8</PackageTargetFallback> <AssemblyName>Prism.Unity.Forms</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <TargetFrameworkProfile>Profile259</TargetFrameworkProfile> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> - <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion> + <PackageId>Prism.Unity.Forms</PackageId> + <Title>Unity for Prism for Xamarin.Forms</Title> + <NeutralLanguage>en-US</NeutralLanguage> + <!-- Summary is not actually supported at this time. Including the summary for future support. --> + <!--<Summary>Unity extensions for Prism for Xamarin.Forms.</Summary>--> + <Description>Use these extensions to build Xamarin.Forms applications with Prism and Unity.</Description> + <PackageTags>prism;xamarin;xamarin.forms;ninject;dependency injection</PackageTags> + <Authors>Brian Lagunas;Brian Noyes</Authors> + <Owners>Brian Lagunas;Brian Noyes</Owners> + <PackageIconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</PackageIconUrl> + <PackageProjectUrl>https://github.com/PrismLibrary/Prism</PackageProjectUrl> + <PackageLicenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</PackageLicenseUrl> + <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> + <RepositoryType>git</RepositoryType> + <RepositoryUrl>https://github.com/PrismLibrary/Prism</RepositoryUrl> + <PackageOutputPath>../../Build</PackageOutputPath> + <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version> + <!-- Update this version when incrementing Library Versions i.e. 7.1.0, 7.2.0 --> + <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' ">7.0.0</VersionPrefix> + <!-- This will create CI builds as 7.0.0-ci1234 --> + <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">ci$(APPVEYOR_BUILD_NUMBER)</VersionSuffix> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'"> + <DefineConstants>$(DefineConstants);DEBUG</DefineConstants> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <DocumentationFile>bin\Release\Prism.Unity.Forms.xml</DocumentationFile> + + <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> + <GenerateDocumentationFile>True</GenerateDocumentationFile> + <GeneratePackageOnBuild>True</GeneratePackageOnBuild> </PropertyGroup> - <PropertyGroup> - <AssemblyOriginatorKeyFile>..\..\prism.pfx</AssemblyOriginatorKeyFile> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|AnyCPU'"> - <OutputPath>bin\Test\</OutputPath> - <DefineConstants>TRACE;DEBUG;TEST;</DefineConstants> - <DocumentationFile>bin\Release\Prism.Unity.Forms.xml</DocumentationFile> - <Optimize>true</Optimize> - <DebugType> - </DebugType> - <PlatformTarget>anycpu</PlatformTarget> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemGroup> - <Compile Include="Extensions\DependencyServiceExtension.cs" /> - <Compile Include="Extensions\DependencyServiceStrategy.cs" /> - <Compile Include="IPlatformInitializer.cs" /> - <Compile Include="Modularity\UnityModuleInitializer.cs" /> - <Compile Include="Navigation\UnityPageNavigationService.cs" /> - <Compile Include="PrismApplication.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="UnityExtensions.cs" /> - </ItemGroup> - <ItemGroup> - <None Include="app.config" /> - <None Include="packages.config" /> - </ItemGroup> + <ItemGroup> - <ProjectReference Include="..\..\Prism\Prism.csproj"> - <Project>{e6c50355-d01e-4caa-884d-d7929861315c}</Project> - <Name>Prism</Name> - </ProjectReference> - <ProjectReference Include="..\Prism.Forms\Prism.Forms.csproj"> - <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project> - <Name>Prism.Forms</Name> - </ProjectReference> + <PackageReference Include="Unity" Version="4.0.1" /> </ItemGroup> + <ItemGroup> - <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Microsoft.Practices.Unity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Unity.4.0.1\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath> - <Private>True</Private> - </Reference> + <ProjectReference Include="../Prism.Forms/Prism.Forms.csproj" /> </ItemGroup> - <ItemGroup /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <Import Project="..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" /> - </Target> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> + </Project>
\ No newline at end of file diff --git a/Source/Xamarin/Prism.Unity.Forms/Properties/AssemblyInfo.cs b/Source/Xamarin/Prism.Unity.Forms/Properties/AssemblyInfo.cs deleted file mode 100644 index c078a77..0000000 --- a/Source/Xamarin/Prism.Unity.Forms/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Prism.Unity.Forms")] -[assembly: AssemblyDescription("Prism.Forms using Unity")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Prism.Unity.Forms")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -[assembly: AssemblyVersion("6.3")] -[assembly: AssemblyFileVersion("6.3.0")] -[assembly: AssemblyInformationalVersion("6.3.0")] diff --git a/Source/Xamarin/Prism.Unity.Forms/packages.config b/Source/Xamarin/Prism.Unity.Forms/packages.config deleted file mode 100644 index 388924c..0000000 --- a/Source/Xamarin/Prism.Unity.Forms/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="CommonServiceLocator" version="1.3" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="Unity" version="4.0.1" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="portable45-net45+win8+wp8+wpa81" /> -</packages>
\ No newline at end of file diff --git a/Source/nuspecs/CreatePrismNuGetPackages.ps1 b/Source/nuspecs/CreatePrismNuGetPackages.ps1 deleted file mode 100644 index 74bc1b8..0000000 --- a/Source/nuspecs/CreatePrismNuGetPackages.ps1 +++ /dev/null @@ -1,315 +0,0 @@ -### This is just the initial script to get the nuget packages out. We need to refactor this script to make it easier to maintain and update -### One idea is to force a Visual Studio build using the Release build configuration before packing the nuspecs - -$nugetOutputDirectory = 'Packages' - -$releaseNotesUri = 'https://github.com/PrismLibrary/Prism/wiki/Release-Notes-6.3.0' - -$xamarinFormsVersion = '2.3.3.193' - -$nugetFileName = 'nuget.exe' - -if (!(Test-Path $nugetFileName)) -{ - Write-Host 'Downloading Nuget.exe ...' - - (New-Object System.Net.WebClient).DownloadFile('http://nuget.org/nuget.exe', $nugetFileName) -} - - - -########################## -###### Prism.Core ###### -########################## -$coreNuspecPath = 'Prism.Core.nuspec' -$coreAssemblyPath = '../Prism/bin/Release/Prism.dll' -if ((Test-Path $coreAssemblyPath)) -{ - $fileInfo = Get-Item $coreAssemblyPath - $coreFileVersion = $fileInfo.VersionInfo.ProductVersion - - Invoke-Expression ".\$($nugetFileName) pack $($coreNuspecPath) -outputdirectory $($nugetOutputDirectory) -Prop version=$($coreFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} -else -{ - Write-Host 'Prism.dll not found' -} - - - -########################### -###### Prism.Wpf ###### -########################### -$wpfNuspecPath = 'Prism.Wpf.nuspec' -$wpfAssemblyPath = '../Wpf/Prism.Wpf/bin/Release/Prism.Wpf.dll' -if ((Test-Path $wpfAssemblyPath)) -{ - $fileInfo = Get-Item $wpfAssemblyPath - $wpfFileVersion = $fileInfo.VersionInfo.ProductVersion - - Invoke-Expression ".\$($nugetFileName) pack $($wpfNuspecPath) -outputdirectory $($nugetOutputDirectory) -Prop version=$($wpfFileVersion) -Prop coreVersion=$($coreFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} -else -{ - Write-Host 'Prism.Wpf.dll not found' -} - - - -########################### -##### Prism.Windows ##### -########################### -$uwpNuspecPath = 'Prism.Windows.nuspec' -$uwpAssemblyPath = '../Windows10/Prism.Windows/bin/Release/Prism.Windows.dll' -if ((Test-Path $uwpAssemblyPath)) -{ - $fileInfo = Get-Item $uwpAssemblyPath - $uwpFileVersion = $fileInfo.VersionInfo.ProductVersion - - Invoke-Expression ".\$($nugetFileName) pack $($uwpNuspecPath) -outputdirectory $($nugetOutputDirectory) -Prop version=$($uwpFileVersion) -Prop coreVersion=$($coreFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} -else -{ - Write-Host 'Prism.Windows.dll not found' -} - - - -########################### -###### Prism.Forms ###### -########################### -$formsNuspecPath = 'Prism.Forms.nuspec' -$formsAssemblyPath = '../Xamarin/Prism.Forms/bin/Release/Prism.Forms.dll' -if ((Test-Path $formsAssemblyPath)) -{ - $fileInfo = Get-Item $formsAssemblyPath - $formsFileVersion = $fileInfo.VersionInfo.ProductVersion - - Invoke-Expression ".\$($nugetFileName) pack $($formsNuspecPath) -outputdirectory $($nugetOutputDirectory) -Prop xamarinFormsVersion=$($xamarinFormsVersion) -Prop version=$($formsFileVersion) -Prop coreVersion=$($coreFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} -else -{ - Write-Host 'Prism.Forms.dll not found' -} - - - -########################### -###### Prism.Unity ###### -########################### -$unityNuspecPath = 'Prism.Unity.nuspec' -$unityWpfAssemblyPath = '../Wpf/Prism.Unity.Wpf/bin/Release/Prism.Unity.Wpf.dll' -$unityUwpAssemblyPath = '../Windows10/Prism.Unity.Windows/bin/Release/Prism.Unity.Windows.dll' -$unityFormsAssemblyPath = '../Xamarin/Prism.Unity.Forms/bin/Release/Prism.Unity.Forms.dll' -if (!(Test-Path $unityWpfAssemblyPath)) -{ - Write-Host 'Prism.Unity.Wpf.dll not found' -} -elseif (!(Test-Path $unityUwpAssemblyPath)) -{ - Write-Host 'Prism.Unity.Windows.dll not found' -} -elseif (!(Test-Path $unityFormsAssemblyPath)) -{ - Write-Host 'Prism.Unity.Forms.dll not found' -} -else -{ - ### all assemblies should be versioned the same, so we can just use the first one ### - $unityWpfFileInfo = Get-Item $unityWpfAssemblyPath - $unityFileVersion = $unityWpfFileInfo.VersionInfo.ProductVersion - - Invoke-Expression ".\$($nugetFileName) pack $($unityNuspecPath) -outputdirectory $($nugetOutputDirectory) -Prop version=$($unityFileVersion) -Prop wpfVersion=$($wpfFileVersion) -Prop uwpVersion=$($uwpFileVersion) -Prop formsVersion=$($formsFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} - -########################### -###### Prism.Unity.Forms ###### -########################### -$unityFormsNuspecPath = 'Prism.Unity.Forms.nuspec' -$unityFormsAssemblyPath = '../Xamarin/Prism.Unity.Forms/bin/Release/Prism.Unity.Forms.dll' -if (!(Test-Path $unityFormsAssemblyPath)) -{ - Write-Host 'Prism.Unity.Forms.dll not found' -} -else -{ - $unityFormsFileInfo = Get-Item $unityFormsAssemblyPath - $unityFileVersion = $unityFormsFileInfo.VersionInfo.ProductVersion - - Invoke-Expression ".\$($nugetFileName) pack $($unityFormsNuspecPath) -outputdirectory $($nugetOutputDirectory) -Prop xamarinFormsVersion=$($xamarinFormsVersion) -Prop version=$($unityFileVersion) -Prop formsVersion=$($formsFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} - -########################### -###### Prism.Autofac.Forms ###### -########################### -$autofacFormsNuspecPath = 'Prism.Autofac.Forms.nuspec' -$autofacFormsAssemblyPath = '../Xamarin/Prism.Autofac.Forms/bin/Release/Prism.Autofac.Forms.dll' -if (!(Test-Path $autofacFormsAssemblyPath)) -{ - Write-Host 'Prism.Autofac.Forms.dll not found' -} -else -{ - $autofacFormsFileInfo = Get-Item $autofacFormsAssemblyPath - $autofacFileVersion = $autofacFormsFileInfo.VersionInfo.ProductVersion - - Invoke-Expression ".\$($nugetFileName) pack $($autofacFormsNuspecPath) -outputdirectory $($nugetOutputDirectory) -Prop xamarinFormsVersion=$($xamarinFormsVersion) -Prop version=$($autofacFileVersion) -Prop formsVersion=$($formsFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} - - - -########################### -##### Prism.Autofac ##### -########################### -$autofacNuspecPath = 'Prism.Autofac.nuspec' -$autofacWpfAssemblyPath = '../Wpf/Prism.Autofac.Wpf/bin/Release/Prism.Autofac.Wpf.dll' -$autofacUwpAssemblyPath = '../Windows10/Prism.Autofac.Windows/bin/Release/Prism.Autofac.Windows.dll' -if (!(Test-Path $autofacWpfAssemblyPath)) -{ - Write-Host 'Prism.Autofac.Wpf.dll not found' -} -elseif (!(Test-Path $autofacUwpAssemblyPath)) -{ - Write-Host 'Prism.Autofac.Windows.dll not found' -} -else -{ - ### all assemblies should be versioned the same, so we can just use the first one ### - $autofacWpfFileInfo = Get-Item $autofacWpfAssemblyPath - $autofacFileVersion = $autofacWpfFileInfo.VersionInfo.ProductVersion - - - Invoke-Expression ".\$($nugetFileName) pack $($autofacNuspecPath) -outputdirectory $($nugetOutputDirectory) -Prop version=$($autofacFileVersion) -Prop wpfVersion=$($wpfFileVersion) -Prop uwpVersion=$($uwpFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} - -########################### -##### Prism.DryIoc ##### -########################### -$dryIocNuspecPath = 'Prism.DryIoc.nuspec' -$dryIocWpfAssemblyPath = '../Wpf/Prism.DryIoc.Wpf/bin/Release/Prism.DryIoc.Wpf.dll' -if (!(Test-Path $dryIocWpfAssemblyPath)) -{ - Write-Host 'Prism.DryIoc.Wpf.dll not found' -} -else -{ - ### all assemblies should be versioned the same, so we can just use the first one ### - $dryIocWpfFileInfo = Get-Item $dryIocWpfAssemblyPath - $dryIocFileVersion = $dryIocWpfFileInfo.VersionInfo.ProductVersion - - - Invoke-Expression ".\$($nugetFileName) pack $($dryIocNuspecPath) -Prop version=$($dryIocFileVersion) -Prop wpfVersion=$($wpfFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} - -########################### -###### Prism.DryIoc.Forms ###### -########################### -$dryIocFormsNuspecPath = 'Prism.DryIoc.Forms.nuspec' -$dryIocFormsAssemblyPath = '../Xamarin/Prism.DryIoc.Forms/bin/Release/Prism.DryIoc.Forms.dll' -if (!(Test-Path $dryIocFormsAssemblyPath)) -{ - Write-Host 'Prism.DryIoc.Forms.dll not found' -} -else -{ - $dryIocFormsFileInfo = Get-Item $dryIocFormsAssemblyPath - $dryIocFileVersion = $dryIocFormsFileInfo.VersionInfo.ProductVersion - - Invoke-Expression ".\$($nugetFileName) pack $($dryIocFormsNuspecPath) -outputdirectory $($nugetOutputDirectory) -Prop xamarinFormsVersion=$($xamarinFormsVersion) -Prop version=$($dryIocFileVersion) -Prop formsVersion=$($formsFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} - - -################################## -##### Prism.SimpleInjector ##### -################################## -$simpleInjectorNuspecPath = 'Prism.SimpleInjector.nuspec' -$simpleInjectorUwpAssemblyPath = '../Windows10/Prism.SimpleInjector.Windows/bin/Release/Prism.SimpleInjector.Windows.dll' -if (!(Test-Path $simpleInjectorUwpAssemblyPath)) -{ - Write-Host 'Prism.SimpleInjector.Windows.dll not found' -} -else -{ - $simpleInjectorFileInfo = Get-Item $simpleInjectorUwpAssemblyPath - $simpleInjectorFileVersion = $simpleInjectorFileInfo.VersionInfo.ProductVersion - - Invoke-Expression ".\$($nugetFileName) pack $($simpleInjectorNuspecPath) -outputdirectory $($nugetOutputDirectory) -Prop version=$($simpleInjectorFileVersion) -Prop coreVersion=$($coreFileVersion) -Prop uwpVersion=$($uwpFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} - - -########################### -####### Prism.Mef ####### -########################### -$mefNuspecPath = 'Prism.Mef.nuspec' -$mefAssemblyPath = '../Wpf/Prism.Mef.Wpf/bin/Release/Prism.Mef.Wpf.dll' -if ((Test-Path $mefAssemblyPath)) -{ - $fileInfo = Get-Item $mefAssemblyPath - $mefFileVersion = $fileInfo.VersionInfo.ProductVersion - - Invoke-Expression ".\$($nugetFileName) pack $($mefNuspecPath) -outputdirectory $($nugetOutputDirectory) -Prop version=$($mefFileVersion) -Prop wpfVersion=$($wpfFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} -else -{ - Write-Host 'Prism.Mef.Wpf.dll not found' -} - - - -########################### -##### Prism.Ninject ##### -########################### -$ninjectNuspecPath = 'Prism.Ninject.nuspec' -$ninjectAssemblyPath = '../Wpf/Prism.Ninject.Wpf/bin/Release/Prism.Ninject.Wpf.dll' -if ((Test-Path $ninjectAssemblyPath)) -{ - $fileInfo = Get-Item $ninjectAssemblyPath - $ninjectFileVersion = $fileInfo.VersionInfo.ProductVersion - - Invoke-Expression ".\$($nugetFileName) pack $($ninjectNuspecPath) -outputdirectory $($nugetOutputDirectory) -Prop version=$($ninjectFileVersion) -Prop wpfVersion=$($wpfFileVersion) -Prop formsVersion=$($formsFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} -else -{ - Write-Host 'Prism.Ninject.Wpf.dll not found' -} - - -################################### -###### Prism.Ninject.Forms ###### -################################### -$ninjectFormsNuspecPath = 'Prism.Ninject.Forms.nuspec' -$ninjectFormsAssemblyPath = '../Xamarin/Prism.Ninject.Forms/bin/Release/Prism.Ninject.Forms.dll' -if (!(Test-Path $ninjectFormsAssemblyPath)) -{ - Write-Host 'Prism.Unity.Forms.dll not found' -} -else -{ - $ninjectFormsFileInfo = Get-Item $ninjectFormsAssemblyPath - $ninjectFormsFileVersion = $ninjectFormsFileInfo.VersionInfo.ProductVersion - - Invoke-Expression ".\$($nugetFileName) pack $($ninjectFormsNuspecPath) -outputdirectory $($nugetOutputDirectory) -Prop xamarinFormsVersion=$($xamarinFormsVersion) -Prop version=$($ninjectFormsFileVersion) -Prop formsVersion=$($formsFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} - - - -########################### -## Prism.StructureMap ### -########################### -$structureMapNuspecPath = 'Prism.StructureMap.nuspec' -$structureMapAssemblyPath = '../Wpf/Prism.StructureMap.Wpf/bin/Release/Prism.StructureMap.Wpf.dll' -if ((Test-Path $structureMapAssemblyPath)) -{ - $fileInfo = Get-Item $structureMapAssemblyPath - $structureMapFileVersion = $fileInfo.VersionInfo.ProductVersion - - Invoke-Expression ".\$($nugetFileName) pack $($structureMapNuspecPath) -outputdirectory $($nugetOutputDirectory) -Prop version=$($structureMapFileVersion) -Prop wpfVersion=$($wpfFileVersion) -Prop releaseNotes=$($releaseNotesUri)" -} -else -{ - Write-Host 'Prism.StructureMap.Wpf.dll not found' -} - - - -Read-Host 'Press Enter to continue'
\ No newline at end of file diff --git a/Source/nuspecs/Prism.Autofac.Forms.nuspec b/Source/nuspecs/Prism.Autofac.Forms.nuspec deleted file mode 100644 index 638ec88..0000000 --- a/Source/nuspecs/Prism.Autofac.Forms.nuspec +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0"?> -<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd"> - <metadata> - <id>Prism.Autofac.Forms</id> - <version>$version$</version> - <title>Autofac for Prism for Xamarin.Forms</title> - <authors>Brian Lagunas, Brian Noyes</authors> - <owners>Brian Lagunas, Brian Noyes</owners> - <licenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</licenseUrl> - <projectUrl>http://prismlibrary.com/</projectUrl> - <iconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</iconUrl> - <requireLicenseAcceptance>false</requireLicenseAcceptance> - <description>Use these extensions to build Xamarin.Forms applications with Prism and Autofac.</description> - <summary>Autofac extensions for Prism for Xamarin.Forms.</summary> - <releaseNotes>$releaseNotes$</releaseNotes> - <language>en-US</language> - <tags>prism mvvm wpf uwp autofac dependency injection di, xamarin, xamarin.forms</tags> - <dependencies> - <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Autofac" version="3.5.2" /> - </group> - <group targetFramework="Xamarin.iOS1.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Autofac" version="3.5.2" /> - </group> - <group targetFramework="MonoTouch1.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Autofac" version="3.5.2" /> - </group> - <group targetFramework="MonoAndroid1.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Autofac" version="3.5.2" /> - </group> - <group targetFramework="Windows8.1"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Autofac" version="3.5.2" /> - </group> - <group targetFramework="WindowsPhoneApp8.1"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Autofac" version="3.5.2" /> - </group> - <group targetFramework="UAP10.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Autofac" version="3.5.2" /> - </group> - <group targetFramework="WindowsPhone8.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Autofac" version="3.5.2" /> - </group> - </dependencies> - </metadata> - <files> - <file src="..\Xamarin\Prism.Autofac.Forms\bin\Release\Prism.Autofac.Forms.*" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Autofac.Forms\bin\Release\Prism.Autofac.Forms.*" target="lib\Xamarin.iOS1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Autofac.Forms\bin\Release\Prism.Autofac.Forms.*" target="lib\MonoTouch1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Autofac.Forms\bin\Release\Prism.Autofac.Forms.*" target="lib\MonoAndroid1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Autofac.Forms\bin\Release\Prism.Autofac.Forms.*" target="lib\Windows8.1\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Autofac.Forms\bin\Release\Prism.Autofac.Forms.*" target="lib\WindowsPhoneApp8.1\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Autofac.Forms\bin\Release\Prism.Autofac.Forms.*" target="lib\UAP10.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Autofac.Forms\bin\Release\Prism.Autofac.Forms.*" target="lib\WindowsPhone8.0\" exclude="**\*.pdb" /> - </files> -</package>
\ No newline at end of file diff --git a/Source/nuspecs/Prism.Core.nuspec b/Source/nuspecs/Prism.Core.nuspec deleted file mode 100644 index 8a9e70e..0000000 --- a/Source/nuspecs/Prism.Core.nuspec +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0"?> -<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> - <metadata> - <id>Prism.Core</id> - <version>$version$</version> - <title>Prism 6</title> - <authors>Brian Lagunas, Brian Noyes</authors> - <owners>Brian Lagunas, Brian Noyes</owners> - <licenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</licenseUrl> - <projectUrl>http://prismlibrary.com/</projectUrl> - <iconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</iconUrl> - <requireLicenseAcceptance>false</requireLicenseAcceptance> - <description>Prism is a fully open source version of the Prism guidance originally produced by Microsoft Patterns & Practices. Prism provides an implementation of a collection of design patterns that are helpful in writing well structured and maintainable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared code base in a Portable Class Library targeting these platforms; WPF, Windows 10 UWP, and Xamarin Forms. Features that need to be platform specific are implemented in the respective libraries for the target platform.</description> - <summary>Prism provides an implementation of a collection of design patterns that are helpful in writing well structured and maintainable applications.</summary> - <releaseNotes>$releaseNotes$</releaseNotes> - <language>en-US</language> - <tags>prism wpf xamarin mvvm uwp uap xaml</tags> - </metadata> - <files> - <file src="..\Prism\bin\Release\Prism.*" target="lib\net45\" exclude="**\*.pdb" /> - <file src="..\Prism\bin\Release\Prism.*" target="lib\wp8\" exclude="**\*.pdb" /> - <file src="..\Prism\bin\Release\Prism.*" target="lib\wp81\" exclude="**\*.pdb" /> - <file src="..\Prism\bin\Release\Prism.*" target="lib\wpa81\" exclude="**\*.pdb" /> - <file src="..\Prism\bin\Release\Prism.*" target="lib\MonoAndroid10\" exclude="**\*.pdb" /> - <file src="..\Prism\bin\Release\Prism.*" target="lib\MonoTouch10\" exclude="**\*.pdb" /> - <file src="..\Prism\bin\Release\Prism.*" target="lib\Xamarin.iOS10\" exclude="**\*.pdb" /> - <file src="..\Prism\bin\Release\Prism.*" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\" exclude="**\*.pdb" /> - </files> -</package>
\ No newline at end of file diff --git a/Source/nuspecs/Prism.DryIoc.Forms.nuspec b/Source/nuspecs/Prism.DryIoc.Forms.nuspec deleted file mode 100644 index 7dc2a4b..0000000 --- a/Source/nuspecs/Prism.DryIoc.Forms.nuspec +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0"?> -<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd"> - <metadata> - <id>Prism.DryIoc.Forms</id> - <version>$version$</version> - <title>DryIoc for Prism for Xamarin.Forms</title> - <authors>Brian Lagunas, Brian Noyes</authors> - <owners>Brian Lagunas, Brian Noyes</owners> - <licenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</licenseUrl> - <projectUrl>http://prismlibrary.com/</projectUrl> - <iconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</iconUrl> - <requireLicenseAcceptance>false</requireLicenseAcceptance> - <description>Use these extensions to build Xamarin.Forms applications with Prism and DryIoc.</description> - <summary>DryIoc extensions for Prism for Xamarin.Forms.</summary> - <releaseNotes>$releaseNotes$</releaseNotes> - <language>en-US</language> - <tags>prism, mvvm, uwp, DryIoc, dependency injection, di, xamarin, xamarin.forms</tags> - <dependencies> - <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="DryIoc.dll" version="2.10.1" /> - </group> - <group targetFramework="Xamarin.iOS1.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="DryIoc.dll" version="2.10.1" /> - </group> - <group targetFramework="MonoTouch1.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="DryIoc.dll" version="2.10.1" /> - </group> - <group targetFramework="MonoAndroid1.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="DryIoc.dll" version="2.10.1" /> - </group> - <group targetFramework="Windows8.1"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="DryIoc.dll" version="2.10.1" /> - </group> - <group targetFramework="WindowsPhoneApp8.1"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="DryIoc.dll" version="2.10.1" /> - </group> - <group targetFramework="UAP10.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="DryIoc.dll" version="2.10.1" /> - </group> - <group targetFramework="WindowsPhone8.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="DryIoc.dll" version="2.10.1" /> - </group> - </dependencies> - </metadata> - <files> - <file src="..\Xamarin\Prism.DryIoc.Forms\bin\Release\Prism.DryIoc.Forms.*" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.DryIoc.Forms\bin\Release\Prism.DryIoc.Forms.*" target="lib\Xamarin.iOS1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.DryIoc.Forms\bin\Release\Prism.DryIoc.Forms.*" target="lib\MonoTouch1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.DryIoc.Forms\bin\Release\Prism.DryIoc.Forms.*" target="lib\MonoAndroid1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.DryIoc.Forms\bin\Release\Prism.DryIoc.Forms.*" target="lib\Windows8.1\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.DryIoc.Forms\bin\Release\Prism.DryIoc.Forms.*" target="lib\WindowsPhoneApp8.1\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.DryIoc.Forms\bin\Release\Prism.DryIoc.Forms.*" target="lib\UAP10.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.DryIoc.Forms\bin\Release\Prism.DryIoc.Forms.*" target="lib\WindowsPhone8.0\" exclude="**\*.pdb" /> - </files> -</package>
\ No newline at end of file diff --git a/Source/nuspecs/Prism.Forms.nuspec b/Source/nuspecs/Prism.Forms.nuspec deleted file mode 100644 index cad894e..0000000 --- a/Source/nuspecs/Prism.Forms.nuspec +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version="1.0"?> -<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd"> - <metadata> - <id>Prism.Forms</id> - <version>$version$</version> - <title>Prism for Xamarin.Forms</title> - <authors>Brian Lagunas, Brian Noyes</authors> - <owners>Brian Lagunas, Brian Noyes</owners> - <licenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</licenseUrl> - <projectUrl>http://prismlibrary.com/</projectUrl> - <iconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</iconUrl> - <requireLicenseAcceptance>false</requireLicenseAcceptance> - <description>Prism provides an implementation of a collection of design patterns that are helpful in writing well structured and maintainable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared code base in a Portable Class Library targeting these platforms; WPF, Windows 10 UWP, and Xamarin Forms. Features that need to be platform specific are implemented in the respective libraries for the target platform. Prism for Xamarin.Forms helps you more easily design and build rich, flexible, and easy to maintain Xamarin.Forms applications.</description> - <summary>Prism for Xamarin.Forms helps you more easily design and build rich, flexible, and easy to maintain Xamarin.Forms applications.</summary> - <releaseNotes>$releaseNotes$</releaseNotes> - <language>en-US</language> - <copyright>Copyright 2015</copyright> - <tags>prism wpf xaml xamarin xamrin.forms</tags> - <dependencies> - <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10"> - <dependency id="Prism.Core" version="$coreVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - </group> - <group targetFramework="Xamarin.iOS1.0"> - <dependency id="Prism.Core" version="$coreVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - </group> - <group targetFramework="MonoTouch1.0"> - <dependency id="Prism.Core" version="$coreVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - </group> - <group targetFramework="MonoAndroid1.0"> - <dependency id="Prism.Core" version="$coreVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - </group> - <group targetFramework="Windows8.1"> - <dependency id="Prism.Core" version="$coreVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - </group> - <group targetFramework="WindowsPhoneApp8.1"> - <dependency id="Prism.Core" version="$coreVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - </group> - <group targetFramework="UAP10.0"> - <dependency id="Prism.Core" version="$coreVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - </group> - <group targetFramework="WindowsPhone8.0"> - <dependency id="Prism.Core" version="$coreVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - </group> - </dependencies> - </metadata> - <files> - <file src="..\Xamarin\Prism.Forms\bin\Release\Prism.Forms.*" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Forms\bin\Release\Prism.Forms.*" target="lib\Xamarin.iOS1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Forms\bin\Release\Prism.Forms.*" target="lib\MonoTouch1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Forms\bin\Release\Prism.Forms.*" target="lib\MonoAndroid1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Forms\bin\Release\Prism.Forms.*" target="lib\Windows8.1\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Forms\bin\Release\Prism.Forms.*" target="lib\WindowsPhoneApp8.1\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Forms\bin\Release\Prism.Forms.*" target="lib\UAP10.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Forms\bin\Release\Prism.Forms.*" target="lib\WindowsPhone8.0\" exclude="**\*.pdb" /> - </files> -</package>
\ No newline at end of file diff --git a/Source/nuspecs/Prism.Ninject.Forms.nuspec b/Source/nuspecs/Prism.Ninject.Forms.nuspec deleted file mode 100644 index 0afa04a..0000000 --- a/Source/nuspecs/Prism.Ninject.Forms.nuspec +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0"?> -<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd"> - <metadata> - <id>Prism.Ninject.Forms</id> - <version>$version$</version> - <title>Ninject for Prism for Xamarin.Forms</title> - <authors>Brian Lagunas, Brian Noyes</authors> - <owners>Brian Lagunas, Brian Noyes</owners> - <licenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</licenseUrl> - <projectUrl>http://prismlibrary.com/</projectUrl> - <iconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</iconUrl> - <requireLicenseAcceptance>false</requireLicenseAcceptance> - <description>Use these extensions to build Xamarin.Forms applications with Prism and Ninject.</description> - <summary>Ninject extensions for Prism for Xamarin.Forms.</summary> - <releaseNotes>$releaseNotes$</releaseNotes> - <language>en-US</language> - <tags>prism mvvm uwp ninject dependency injection di, xamarin, xamarin.forms</tags> - <dependencies> - <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Portable.Ninject" version="3.3.1" /> - </group> - <group targetFramework="Xamarin.iOS1.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Portable.Ninject" version="3.3.1" /> - </group> - <group targetFramework="MonoTouch1.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Portable.Ninject" version="3.3.1" /> - </group> - <group targetFramework="MonoAndroid1.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Portable.Ninject" version="3.3.1" /> - </group> - <group targetFramework="Windows8.1"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Portable.Ninject" version="3.3.1" /> - </group> - <group targetFramework="WindowsPhoneApp8.1"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Portable.Ninject" version="3.3.1" /> - </group> - <group targetFramework="UAP10.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Portable.Ninject" version="3.3.1" /> - </group> - <group targetFramework="WindowsPhone8.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Portable.Ninject" version="3.3.1" /> - </group> - </dependencies> - </metadata> - <files> - <file src="..\Xamarin\Prism.Ninject.Forms\bin\Release\Prism.Ninject.Forms.*" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Ninject.Forms\bin\Release\Prism.Ninject.Forms.*" target="lib\Xamarin.iOS1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Ninject.Forms\bin\Release\Prism.Ninject.Forms.*" target="lib\MonoTouch1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Ninject.Forms\bin\Release\Prism.Ninject.Forms.*" target="lib\MonoAndroid1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Ninject.Forms\bin\Release\Prism.Ninject.Forms.*" target="lib\Windows8.1\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Ninject.Forms\bin\Release\Prism.Ninject.Forms.*" target="lib\WindowsPhoneApp8.1\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Ninject.Forms\bin\Release\Prism.Ninject.Forms.*" target="lib\UAP10.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Ninject.Forms\bin\Release\Prism.Ninject.Forms.*" target="lib\WindowsPhone8.0\" exclude="**\*.pdb" /> - </files> -</package>
\ No newline at end of file diff --git a/Source/nuspecs/Prism.Unity.Forms.nuspec b/Source/nuspecs/Prism.Unity.Forms.nuspec deleted file mode 100644 index 62152ab..0000000 --- a/Source/nuspecs/Prism.Unity.Forms.nuspec +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0"?> -<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd"> - <metadata> - <id>Prism.Unity.Forms</id> - <version>$version$</version> - <title>Unity for Prism for Xamarin.Forms</title> - <authors>Brian Lagunas, Brian Noyes</authors> - <owners>Brian Lagunas, Brian Noyes</owners> - <licenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</licenseUrl> - <projectUrl>http://prismlibrary.com/</projectUrl> - <iconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</iconUrl> - <requireLicenseAcceptance>false</requireLicenseAcceptance> - <description>Use these extensions to build Xamarin.Forms applications with Prism and Unity.</description> - <summary>Unity extensions for Prism for Xamarin.Forms.</summary> - <releaseNotes>$releaseNotes$</releaseNotes> - <language>en-US</language> - <tags>prism mvvm uwp unity dependency injection di, xamarin, xamarin.forms</tags> - <dependencies> - <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Unity" version="4.0.1" /> - </group> - <group targetFramework="Xamarin.iOS1.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Unity" version="4.0.1" /> - </group> - <group targetFramework="MonoTouch1.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Unity" version="4.0.1" /> - </group> - <group targetFramework="MonoAndroid1.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Unity" version="4.0.1" /> - </group> - <group targetFramework="Windows8.1"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Unity" version="4.0.1" /> - </group> - <group targetFramework="WindowsPhoneApp8.1"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Unity" version="4.0.1" /> - </group> - <group targetFramework="UAP10.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Unity" version="4.0.1" /> - </group> - <group targetFramework="WindowsPhone8.0"> - <dependency id="Prism.Forms" version="$formsVersion$" /> - <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" /> - <dependency id="Unity" version="4.0.1" /> - </group> - </dependencies> - </metadata> - <files> - <file src="..\Xamarin\Prism.Unity.Forms\bin\Release\Prism.Unity.Forms.*" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Unity.Forms\bin\Release\Prism.Unity.Forms.*" target="lib\Xamarin.iOS1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Unity.Forms\bin\Release\Prism.Unity.Forms.*" target="lib\MonoTouch1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Unity.Forms\bin\Release\Prism.Unity.Forms.*" target="lib\MonoAndroid1.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Unity.Forms\bin\Release\Prism.Unity.Forms.*" target="lib\Windows8.1\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Unity.Forms\bin\Release\Prism.Unity.Forms.*" target="lib\WindowsPhoneApp8.1\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Unity.Forms\bin\Release\Prism.Unity.Forms.*" target="lib\UAP10.0\" exclude="**\*.pdb" /> - <file src="..\Xamarin\Prism.Unity.Forms\bin\Release\Prism.Unity.Forms.*" target="lib\WindowsPhone8.0\" exclude="**\*.pdb" /> - </files> -</package>
\ No newline at end of file diff --git a/Source/nuspecs/nuget.ps1 b/Source/nuspecs/nuget.ps1 new file mode 100644 index 0000000..4d73a75 --- /dev/null +++ b/Source/nuspecs/nuget.ps1 @@ -0,0 +1,116 @@ +$nugetOutputDirectory = '../Build' + +$releaseNotesUri = 'https://github.com/PrismLibrary/Prism/wiki/Release-Notes-' +$coreFileVersion = '1.0.0' +$nugetFileName = 'nuget.exe' + +Write-Host "Packing $env:solution_name" + +function Get-FileVersion +{ + [OutputType([string])] + Param ([string]$assemblyPath) + + if(!$assemblyPath) + { + return "" + } + + if((Test-Path $assemblyPath)) + { + $fileInfo = Get-Item $assemblyPath + return $fileInfo.VersionInfo.ProductVersion + } + + throw "Could not locate the assembly '$assemblyPath'" +} + +function ConvertTo-NuGetExpression +{ + [OutputType([string])] + Param ( + [string]$nuspecPath, + [string]$wpfVersion, + [string]$uwpVersion + ) + + $fileVersion = $wpfVersion + + if(!$fileVersion) + { + $fileVersion = $uwpVersion + } + + $expression = ".\$($nugetFileName) pack $($nuspecPath) -OutputDirectory $nugetOutputDirectory -Prop 'version=$($fileVersion)' -Prop 'coreVersion=$($fileVersion)' -Prop 'releaseNotes=$($releaseNotesUri)$fileVersion'" + + if($wpfVersion) + { + $expression = "$expression -Prop 'wpfVersion=$($wpfVersion)'" + } + + if($uwpVersion) + { + $expression = "$expression -Prop 'uwpVersion=$($uwpVersion)'" + } + + Write-Host "Finished Expression: $expression" + return $expression +} + +function Save-NuGetPackage ($project) +{ + $nuspecPath = $project.NuSpec + $wpfAssemblyPath = $project.Files.Wpf + $uwpAssemblyPath = $project.Files.UWP + + Write-Host "NuSpec: $nuspecPath" + Write-Host "WPF Assembly: $wpfAssemblyPath" + Write-Host "UWP Assembly: $uwpAssemblyPath" + + $wpfVersion = Get-FileVersion -assemblyPath $wpfAssemblyPath + $uwpVersion = Get-FileVersion -assemblyPath $uwpAssemblyPath + + Write-Host "WPF Version: $wpfVersion" + Write-Host "UWP Version: $uwpVersion" + + if($wpfVersion -eq '' -and $uwpVersion -eq '') + { + Write-Host "Something seems to be wrong, we couldn't locate any binaries for $($project.Name)" + return + } + + Invoke-Expression "$(ConvertTo-NuGetExpression -nuspecPath $nuspecPath -wpfVersion $wpfVersion -uwpVersion $uwpVersion)" +} + +if(Test-Path ./Source) +{ + $returnPath = "../.." + Set-Location ./Source/nuspecs +} + +if (!(Test-Path $nugetFileName)) +{ + Write-Host 'Downloading Nuget.exe ...' + Invoke-WebRequest -Uri "http://nuget.org/nuget.exe" -OutFile $nugetFileName +} + +$projectsJson = Get-Content -Raw -Path projects.json | ConvertFrom-Json +$coreFileVersion = Get-FileVersion -assemblyPath $projectsJson.Core + +if($IsWindows -or $PSEdition -eq "Desktop") +{ + foreach ($project in $projectsJson.Projects) + { + Write-Host "Building package for $($project.Name)" + Save-NuGetPackage -project $project + } +} +else +{ + Write-Host "This script must be executed on Windows" +} + +if($returnPath) +{ + Set-Location $returnPath +}
\ No newline at end of file diff --git a/Source/nuspecs/projects.json b/Source/nuspecs/projects.json new file mode 100644 index 0000000..09d4fc8 --- /dev/null +++ b/Source/nuspecs/projects.json @@ -0,0 +1,77 @@ +{ + "core": "../Prism/bin/Release/netstandard1.0/Prism.dll", + "projects": [ + { + "name": "Prism.Autofac", + "nuspec": "Prism.Autofac.nuspec", + "files": { + "uwp": "../Windows10/Prism.Autofac.Windows/bin/Release/Prism.Autofac.Windows.dll", + "wpf": "../Wpf/Prism.Autofac.Wpf/bin/Release/Prism.Autofac.Wpf.dll" + } + }, + { + "name": "Prism.DryIoc", + "nuspec": "Prism.DryIoc.nuspec", + "files": { + "uwp": "", + "wpf": "../Wpf/Prism.DryIoc.Wpf/bin/Release/Prism.DryIoc.Wpf.dll" + } + }, + { + "name": "Prism.Mef", + "nuspec": "Prism.Mef.nuspec", + "files": { + "uwp": "", + "wpf": "../Wpf/Prism.Mef.Wpf/bin/Release/Prism.Mef.Wpf.dll" + } + }, + { + "name": "Prism.Ninject", + "nuspec": "Prism.Ninject.nuspec", + "files": { + "uwp": "", + "wpf": "../Wpf/Prism.Ninject.Wpf/bin/Release/Prism.Ninject.Wpf.dll" + } + }, + { + "name": "Prism.SimpleInjector", + "nuspec": "Prism.SimpleInjector.nuspec", + "files": { + "uwp": "../Windows10/Prism.SimpleInjector.Windows/bin/Release/Prism.SimpleInjector.Windows.dll", + "wpf": "" + } + }, + { + "name": "Prism.StructureMap", + "nuspec": "Prism.StructureMap.nuspec", + "files": { + "uwp": "", + "wpf": "../Wpf/Prism.StructureMap.Wpf/bin/Release/Prism.StructureMap.Wpf.dll" + } + }, + { + "name": "Prism.Unity", + "nuspec": "Prism.Unity.nuspec", + "files": { + "uwp": "../Windows10/Prism.Unity.Windows/bin/Release/Prism.Unity.Windows.dll", + "wpf": "../Wpf/Prism.Unity.Wpf/bin/Release/Prism.Unity.Wpf.dll" + } + }, + { + "name": "Prism.Windows", + "nuspec": "Prism.Windows.nuspec", + "files": { + "uwp": "../Windows10/Prism.Windows/bin/Release/Prism.Windows.dll", + "wpf": "" + } + }, + { + "name": "Prism.Wpf", + "nuspec": "Prism.Wpf.nuspec", + "files": { + "uwp": "", + "wpf": "../Wpf/Prism.Wpf/bin/Release/Prism.Wpf.dll" + } + } + ] +}
\ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..c21708d --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,239 @@ +version: 7.0.0.{build} +image: Visual Studio 2017 +shallow_clone: true +skip_branch_with_pr: true +skip_tags: true +configuration: + - Test + - Debug + - Release + +only_commits: + files: + - appveyor.yml + - Source\* + - Source\nuspecs\* + - Sandbox\* + +skip_commits: + files: + - '**/*.md' + +nuget: + disable_publish_on_pr: true + +init: +- ps: >- + $informationalVersion = "7.0.0" + + if($env:APPVEYOR_REPO_TAG -eq $true) + + { + $informationalVersion = $env:APPVEYOR_REPO_TAG_NAME -creplace '^.*\.v', '' + $env:PRISM_RELEASE = $informationalVersion + } + + else + + { + $informationalVersion += "-ci$env:APPVEYOR_BUILD_NUMBER" + } + + Update-AppveyorBuild -Version $informationalVersion + + Write-Host "AppVeyor Build Version:" $env:APPVEYOR_BUILD_VERSION + + Write-Host "Commit:$env:APPVEYOR_REPO_COMMIT_MESSAGE" + + Write-Host "Commit extended:" $env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED +assembly_info: + + patch: true + file: 'Source\**\AssemblyInfo.cs' + assembly_version: '1.0.0.0' + assembly_informational_version: '$(appveyor_build_version)' + +environment: + matrix: + - solution_name: .\Source\PrismLibrary_Core.sln + - solution_name: .\Sandbox\Windows10\HelloWorld\HelloWorld.sln + - solution_name: .\Source\PrismLibrary_Win10.sln + - solution_name: .\Source\PrismLibrary_Wpf.sln + - solution_name: .\Sandbox\Xamarin\HelloWorld\HelloWorld.sln + - solution_name: .\Source\PrismLibrary_XF.sln + - solution_name: .\Source\PrismLibrary.sln + +matrix: + exclude: + # PrismLibrary.sln should only be built in release for the NuGet pack + - solution_name: .\Source\PrismLibrary.sln + configuration: Test + - solution_name: .\Source\PrismLibrary.sln + configuration: Debug + # PrismLibrary_Core, PrismLibrary_Win10, & PrismLibrary_Wpf only need to build in Release + - solution_name: .\Source\PrismLibrary_Core.sln + configuration: Test + - solution_name: .\Source\PrismLibrary_Core.sln + configuration: Debug + - solution_name: .\Source\PrismLibrary_Win10.sln + configuration: Test + - solution_name: .\Source\PrismLibrary_Win10.sln + configuration: Debug + - solution_name: .\Source\PrismLibrary_Wpf.sln + configuration: Test + - solution_name: .\Source\PrismLibrary_Wpf.sln + configuration: Debug + # PrismLibrary_XF.sln can only be tested with the Test configuration + - solution_name: .\Source\PrismLibrary_XF.sln + configuration: Debug + # The Sandbox solutions should only be built in debug for validation + - solution_name: .\Sandbox\Windows10\HelloWorld\HelloWorld.sln + configuration: Test + - solution_name: .\Sandbox\Windows10\HelloWorld\HelloWorld.sln + configuration: Release + - solution_name: .\Sandbox\Xamarin\HelloWorld\HelloWorld.sln + configuration: Test + - solution_name: .\Sandbox\Xamarin\HelloWorld\HelloWorld.sln + configuration: Release + +before_build: + - nuget restore %solution_name% + +build_script: + - msbuild %solution_name% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + +after_build: +- ps: >- + if($env:solution_name.EndsWith("PrismLibrary_XF.sln") -and $env:Configuration -eq 'Release') + + { + Write-Host "Packing PrismLibrary_XF" + dotnet pack $env:solution_name -c $env:Configuration --no-build + } + + elseif($env:Configuration -eq 'Release' -and $env:solution_name.EndsWith("PrismLibrary.sln")) + + { + Write-Host "Packing $env:solution_name" + .\Source\nuspecs\nuget.ps1 + } + + Write-Host "Looking for build Artifacts...." + + if($env:Configuration -eq 'Release') + + { + $env:SOLUTION_ARTIFACTS_DIRECTORY = (Get-Item $env:solution_name).Basename + + if($env:SOLUTION_ARTIFACTS_DIRECTORY -eq "PrismLibrary" -or $env:SOLUTION_ARTIFACTS_DIRECTORY -eq "PrismLibrary_Wpf") + { + $outputDir = if($env:SOLUTION_ARTIFACTS_DIRECTORY -eq "PrismLibrary") {"$($env:SOLUTION_ARTIFACTS_DIRECTORY)/net45"} else {"PrismLibrary"} + New-Item -ItemType Directory -Force -Path $outputDir + $wpfArtifacts = @( + "./Source/Prism/bin/Release/**/Prism*", + "./Source/Wpf/Prism.Autofac.Wpf/bin/Release/Prism*", + "./Source/Wpf/Prism.DryIoc.Wpf/bin/Release/Prism*", + "./Source/Wpf/Prism.Mef.Wpf/bin/Release/Prism*", + "./Source/Wpf/Prism.Ninject.Wpf/bin/Release/Prism*", + "./Source/Wpf/Prism.StructureMap.Wpf/bin/Release/Prism*", + "./Source/Wpf/Prism.Unity.Wpf/bin/Release/Prism*", + "./Source/Wpf/Prism.Wpf/bin/Release/Prism*" + ) + Write-Host "Writing artifacts to $outputDir" + Copy-Item $wpfArtifacts -Destination $outputDir -Force -Confirm:$False + } + + if($env:SOLUTION_ARTIFACTS_DIRECTORY -eq "PrismLibrary" -or $env:SOLUTION_ARTIFACTS_DIRECTORY -eq "PrismLibrary_Win10") + { + $outputDir = if($env:SOLUTION_ARTIFACTS_DIRECTORY -eq "PrismLibrary") {"$($env:SOLUTION_ARTIFACTS_DIRECTORY)/uap10"} else {"PrismLibrary"} + New-Item -ItemType Directory -Force -Path $outputDir + $winArtifacts = @( + "./Source/Prism/bin/Release/**/Prism*", + "./Source/Windows10/Prism.Autofac.Windows/bin/Release/Prism*", + "./Source/Windows10/Prism.SimpleInjector.Windows/bin/Release/Prism*", + "./Source/Windows10/Prism.Unity.Windows/bin/Release/Prism*", + "./Source/Windows10/Prism.Windows/bin/Release/Prism*" + ) + Copy-Item $winArtifacts -Destination $outputDir -Force -Confirm:$False + } + + if($env:SOLUTION_ARTIFACTS_DIRECTORY -eq "PrismLibrary" -or $env:SOLUTION_ARTIFACTS_DIRECTORY -eq "PrismLibrary_XF") + { + $outputDir = if($env:SOLUTION_ARTIFACTS_DIRECTORY -eq "PrismLibrary") {"$($env:SOLUTION_ARTIFACTS_DIRECTORY)/netstandard"} else {"PrismLibrary"} + New-Item -ItemType Directory -Force -Path $outputDir + $xfArtifacts = @( + "./Source/Prism/bin/Release/net*", + "./Source/Xamarin/Prism.Autofac.Forms/bin/Release/net*" + "./Source/Xamarin/Prism.DryIoc.Forms/bin/Release/net*" + "./Source/Xamarin/Prism.Forms/bin/Release/net*" + "./Source/Xamarin/Prism.Ninject.Forms/bin/Release/net*" + "./Source/Xamarin/Prism.Unity.Forms/bin/Release/net*" + ) + Copy-Item $xfArtifacts -Destination $outputDir -Recurse -Force -Confirm:$False + } + } + +# UWP tests are not currently not supported by appveyor: https://github.com/appveyor/ci/issues/393 +test_script: +- ps: >- + Write-Host "Starting Test Run: $env:solution_name - $env:Configuration" + + if($env:solution_name -like '*PrismLibrary_Core*') + + { + Write-Host "Testing Prism Core" + dotnet test .\Source\Prism.Tests\Prism.Tests.csproj -c $env:Configuration + } + + elseif($env:solution_name -like '*PrismLibrary_Win10*') + + { + Write-Host "Testing Windows 10" + Write-Host "UWP tests are not currently not supported by appveyor:https://github.com/appveyor/ci/issues/393" + vstest.console /logger:Appveyor .\Source\Windows10\Prism.Windows.Tests\bin\$env:Configuration\Prism.Windows.Tests.exe + } + + elseif($env:solution_name -like '*PrismLibrary_Wpf*') + + { + Write-Host "Testing WPF" + vstest.console /logger:Appveyor .\Source\Wpf\\Prism.Wpf.Tests\bin\$env:Configuration\Prism.Wpf.Tests.dll + vstest.console /logger:Appveyor .\Source\Wpf\Prism.Autofac.Wpf.Tests\bin\$env:Configuration\Prism.Autofac.Wpf.Tests.dll + vstest.console /logger:Appveyor .\Source\Wpf\Prism.DryIoc.Wpf.Tests\bin\$env:Configuration\Prism.DryIoc.Wpf.Tests.dll + vstest.console /logger:Appveyor .\Source\Wpf\Prism.Mef.Wpf.Tests\bin\$env:Configuration\Prism.Mef.Wpf.Tests.dll + vstest.console /logger:Appveyor .\Source\Wpf\Prism.StructureMap.Wpf.Tests\bin\$env:Configuration\Prism.StructureMap.Wpf.Tests.dll + vstest.console /logger:Appveyor .\Source\Wpf\Prism.Unity.Wpf.Tests\bin\$env:Configuration\Prism.Unity.Wpf.Tests.dll + } + + elseif($env:solution_name -like '*PrismLibrary_XF*' -and $env:Configuration -eq "Test") + + { + Write-Host "Testing Prism Forms" + dotnet test .\Source\Xamarin\Prism.Forms.Tests\Prism.Forms.Tests.csproj -c Test --no-build + dotnet test .\Source\Xamarin\Prism.Autofac.Forms.Tests\Prism.Autofac.Forms.Tests.csproj -c Test --no-build + dotnet test .\Source\Xamarin\Prism.DryIoc.Forms.Tests\Prism.DryIoc.Forms.Tests.csproj -c Test --no-build + dotnet test .\Source\Xamarin\Prism.Unity.Forms.Tests\Prism.Unity.Forms.Tests.csproj -c Test --no-build + } + +artifacts: + - path: '**\Build\*.nupkg' + - path: '**\nuspecs\**\*.nupkg' + - path: '$(solution_artifacts_directory)' + +# deploy: +# - provider: NuGet +# server: https://www.myget.org/F/prism/api/v2/package +# api_key: +# secure: hPrzACGookFpABk0yLEZECc3bOpIEubvv2AJaTuKYKsiDrJSjywelIch9z/KgBlR +# skip_symbols: false +# on: +# branch: master +# Configuration: Release +# - provider: NuGet +# server: https://www.myget.org/F/prism/api/v2/package +# api_key: +# secure: hPrzACGookFpABk0yLEZECc3bOpIEubvv2AJaTuKYKsiDrJSjywelIch9z/KgBlR +# skip_symbols: false +# on: +# appveyor_repo_tag: true +# Configuration: Release
\ No newline at end of file |