Skip to content

Commit 90d4161

Browse files
RLittlesIIRLittlesII
committed
housekeeping: Fixed Popup Sample
1 parent 43d00e8 commit 90d4161

File tree

7 files changed

+21
-20
lines changed

7 files changed

+21
-20
lines changed

‎common.build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<Owners>RLittlesII</Owners>
44
<Authors>Rodney Littles, II</Authors>
55
<Copyright>Copyright (c) Rodney Littles, II</Copyright>
6-
<Copyright>© Rodney Littles, II. All rights reserved.</Copyright>
76
<PackageDescription>This package provides a base class for implementing Popup Pages using the Rg.Plugins.Popup package with ReactiveUI.XamForms.</PackageDescription>
87
<LangVersion>latest</LangVersion>
98
<RepositoryUrl>https://github.com/RLittlesII/ReactiveUI.Plugins.Popup</RepositoryUrl>

‎common.build.targets

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project>
22
<ItemGroup>
3-
<PackageReference Update="ReactiveUI.XamForms" Version="9.19.2" />
3+
<PackageReference Update="System.Reactive" Version="4.1.0" />
4+
<PackageReference Update="ReactiveUI.XamForms" Version="9.12.1" />
45
<PackageReference Update="Rg.Plugins.Popup" Version="1.*" />
56
<PackageReference Update="Xamarin.Forms" Version="4.0.*" />
67
</ItemGroup>
@@ -10,7 +11,7 @@
1011
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.9.0" />
1112
<PackageReference Update="Microsoft.Reactive.Testing" Version="4.0.0" />
1213
<PackageReference Update="NSubstitute" Version="3.1.0" />
13-
<PackageReference Update="ReactiveUI.Testing" Version="9.*" />
14+
<PackageReference Update="ReactiveUI.Testing" Version="9.12.1" />
1415
<PackageReference Update="xunit" Version="2.4.1" />
1516
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
1617
<PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />

‎samples/Popup/Popup.sln

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS", "src\iOS\iOS.csproj",
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Popup", "src\Popup\Popup.csproj", "{61BA8A6F-6048-4064-90CE-1A259CF66AC9}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Plugins.Popup", "..\..\src\ReactiveUI.Plugins.Popup\ReactiveUI.Plugins.Popup.csproj", "{6F0FD18D-D49D-48C1-9C07-10310C40CFED}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RxUI.Plugins.Popup", "..\..\src\ReactiveUI.Plugins.Popup\RxUI.Plugins.Popup.csproj", "{F1B3AA03-ACB5-4206-9D86-9603D7D70988}"
1313
EndProject
1414
Global
1515
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -75,18 +75,18 @@ Global
7575
{61BA8A6F-6048-4064-90CE-1A259CF66AC9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
7676
{61BA8A6F-6048-4064-90CE-1A259CF66AC9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
7777
{61BA8A6F-6048-4064-90CE-1A259CF66AC9}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
78-
{6F0FD18D-D49D-48C1-9C07-10310C40CFED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79-
{6F0FD18D-D49D-48C1-9C07-10310C40CFED}.Debug|Any CPU.Build.0 = Debug|Any CPU
80-
{6F0FD18D-D49D-48C1-9C07-10310C40CFED}.Debug|iPhone.ActiveCfg = Debug|Any CPU
81-
{6F0FD18D-D49D-48C1-9C07-10310C40CFED}.Debug|iPhone.Build.0 = Debug|Any CPU
82-
{6F0FD18D-D49D-48C1-9C07-10310C40CFED}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
83-
{6F0FD18D-D49D-48C1-9C07-10310C40CFED}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
84-
{6F0FD18D-D49D-48C1-9C07-10310C40CFED}.Release|Any CPU.ActiveCfg = Release|Any CPU
85-
{6F0FD18D-D49D-48C1-9C07-10310C40CFED}.Release|Any CPU.Build.0 = Release|Any CPU
86-
{6F0FD18D-D49D-48C1-9C07-10310C40CFED}.Release|iPhone.ActiveCfg = Release|Any CPU
87-
{6F0FD18D-D49D-48C1-9C07-10310C40CFED}.Release|iPhone.Build.0 = Release|Any CPU
88-
{6F0FD18D-D49D-48C1-9C07-10310C40CFED}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
89-
{6F0FD18D-D49D-48C1-9C07-10310C40CFED}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
78+
{F1B3AA03-ACB5-4206-9D86-9603D7D70988}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79+
{F1B3AA03-ACB5-4206-9D86-9603D7D70988}.Debug|Any CPU.Build.0 = Debug|Any CPU
80+
{F1B3AA03-ACB5-4206-9D86-9603D7D70988}.Debug|iPhone.ActiveCfg = Debug|Any CPU
81+
{F1B3AA03-ACB5-4206-9D86-9603D7D70988}.Debug|iPhone.Build.0 = Debug|Any CPU
82+
{F1B3AA03-ACB5-4206-9D86-9603D7D70988}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
83+
{F1B3AA03-ACB5-4206-9D86-9603D7D70988}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
84+
{F1B3AA03-ACB5-4206-9D86-9603D7D70988}.Release|Any CPU.ActiveCfg = Release|Any CPU
85+
{F1B3AA03-ACB5-4206-9D86-9603D7D70988}.Release|Any CPU.Build.0 = Release|Any CPU
86+
{F1B3AA03-ACB5-4206-9D86-9603D7D70988}.Release|iPhone.ActiveCfg = Release|Any CPU
87+
{F1B3AA03-ACB5-4206-9D86-9603D7D70988}.Release|iPhone.Build.0 = Release|Any CPU
88+
{F1B3AA03-ACB5-4206-9D86-9603D7D70988}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
89+
{F1B3AA03-ACB5-4206-9D86-9603D7D70988}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
9090
EndGlobalSection
9191
GlobalSection(SolutionProperties) = preSolution
9292
HideSolutionNode = FALSE

‎samples/Popup/src/Popup/Base/PopupPageBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Text;
4-
using ReactiveUI.Plugins.Popup;
4+
using RxUI.Plugins.Popup;
55
using Xamarin.Forms;
66

77
namespace Popup

‎samples/Popup/src/Popup/Modal/ModalPage.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Text;
55
using System.Threading.Tasks;
66
using ReactiveUI;
7-
using ReactiveUI.Plugins.Popup;
7+
using RxUI.Plugins.Popup;
88
using Xamarin.Forms;
99
using Xamarin.Forms.Xaml;
1010

‎samples/Popup/src/Popup/Popup.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14+
<PackageReference Include="System.Reactive" Version="4.2.0" />
1415
<PackageReference Include="Xamarin.Forms" Version="4.0.0.425677" />
1516
<PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
1617
</ItemGroup>
1718

1819
<ItemGroup>
19-
<ProjectReference Include="..\..\..\..\src\ReactiveUI.Plugins.Popup\ReactiveUI.Plugins.Popup.csproj" />
20+
<ProjectReference Include="..\..\..\..\src\ReactiveUI.Plugins.Popup\RxUI.Plugins.Popup.csproj" />
2021
</ItemGroup>
2122

2223
<ItemGroup>

‎samples/Popup/src/Popup/Start/StartPage.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Text;
66
using System.Threading.Tasks;
77
using ReactiveUI;
8-
using ReactiveUI.Plugins.Popup;
8+
using RxUI.Plugins.Popup;
99
using ReactiveUI.XamForms;
1010
using Xamarin.Forms;
1111
using Xamarin.Forms.Xaml;

0 commit comments

Comments
 (0)