Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Update packages, Fix WPF Sample app #1768

Merged
merged 3 commits into from
Jan 22, 2022
Merged

Update packages, Fix WPF Sample app #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b121bde
Update packages, Fix WPF Sample app
VladislavAntonyuk Dec 17, 2021
5e43e6b
Merge branch 'main' into update-package
VladislavAntonyuk Dec 17, 2021
cc6f959
Merge branch 'main' into update-package
TheCodeTraveler Jan 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion samples/XCT.Sample.Android/Xamarin.CommunityToolkit.Sample.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
<PackageReference Include="Xamarin.Forms.PancakeView" Version="2.3.0.759" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/XCT.Sample.Tizen/Xamarin.CommunityToolkit.Sample.Tizen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/XCT.Sample.UWP/Xamarin.CommunityToolkit.Sample.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@
</Page>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.12" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\XCT.Sample\Xamarin.CommunityToolkit.Sample.csproj">
Expand Down
2 changes: 1 addition & 1 deletion samples/XCT.Sample.iOS/Xamarin.CommunityToolkit.Sample.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
<Reference Include="System.Numerics.Vectors" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
<PackageReference Include="Xamarin.Forms.PancakeView" Version="2.3.0.759" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
Expand Down
1 change: 0 additions & 1 deletion samples/XCT.Sample/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System.Globalization;
using Xamarin.CommunityToolkit.Helpers;
using Xamarin.CommunityToolkit.Sample.Pages;
using Xamarin.CommunityToolkit.Sample.Pages.Views;
using Xamarin.CommunityToolkit.Sample.Resx;
using Xamarin.Forms.PlatformConfiguration;
using Xamarin.Forms.PlatformConfiguration.WindowsSpecific;
Expand Down
7 changes: 7 additions & 0 deletions samples/XCT.Sample/Pages/Base/BasePage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Windows.Input;
using Xamarin.CommunityToolkit.ObjectModel;
using Xamarin.CommunityToolkit.Sample.Models;
using Xamarin.CommunityToolkit.Sample.ViewModels;
using Xamarin.Forms;
using Xamarin.Forms.PlatformConfiguration;
using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
Expand Down Expand Up @@ -35,5 +36,11 @@ Forms.Page PreparePage(SectionModel model)
page.DetailColor = model.Color;
return page;
}

protected override void OnAppearing()
{
base.OnAppearing();
(BindingContext as BaseGalleryViewModel)?.FilterCommand.Execute(string.Empty);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hack for WPF sample to fix layout issue

}
}
}
2 changes: 1 addition & 1 deletion samples/XCT.Sample/Xamarin.CommunityToolkit.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
<PackageReference Include="Octokit" Version="0.50.0" />
<PackageReference Include="Xamarin.Forms.DebugRainbows" Version="1.1.4" />
<PackageReference Include="Xamarin.Forms.PancakeView" Version="2.3.0.759" />
Expand Down
2 changes: 1 addition & 1 deletion ...unityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
10 changes: 5 additions & 5 deletions src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<Compile Include="**/*.shared.*.cs" />
<None Include="..\..\..\LICENSE" PackagePath="" Pack="true" />
<None Include="..\..\..\assets\XamarinCommunityToolkit_128x128.png" PackagePath="icon.png" Pack="true" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
<PackageReference Include="mdoc" Version="5.8.3" PrivateAssets="all" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2291" />
<PackageReference Include="mdoc" Version="5.8.5" PrivateAssets="all" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
<Compile Include="**/*.netstandard.cs" />
Expand Down Expand Up @@ -154,20 +154,20 @@
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="WindowsBase" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2125" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2291" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('netcoreapp')) AND '$(OS)' == 'Windows_NT' ">
<Compile Include="**\*.wpf.cs" />
<Compile Include="**\*.wpf.*.cs" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2125" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2291" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net471')) ">
<Compile Include="**\*.gtk.cs" />
<Compile Include="**\*.gtk.*.cs" />
<PackageReference Include="Xamarin.Forms.Platform.GTK" Version="5.0.0.2125" />
<PackageReference Include="Xamarin.Forms.Platform.GTK" Version="5.0.0.2291" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion ...amarin.CommunityToolkit.Markup.UnitTests/Xamarin.CommunityToolkit.Markup.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions src/Markup/Xamarin.CommunityToolkit.Markup/Xamarin.CommunityToolkit.Markup.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
<PackageReference Include="mdoc" Version="5.8.3" PrivateAssets="all" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2291" />
<PackageReference Include="mdoc" Version="5.8.5" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\LICENSE" PackagePath="" Pack="true" />
Expand Down