Skip to content

Commit

Permalink
.net8 rc2
Browse files Browse the repository at this point in the history
  • Loading branch information
VladislavAntonyuk committed Oct 11, 2023
1 parent 4d320b1 commit b5fb681
Show file tree
Hide file tree
Showing 62 changed files with 1,223 additions and 44 deletions.
2 changes: 1 addition & 1 deletion Auth/AuthServices/AuthServices.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Client" Version="4.55.0" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.56.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.1.0-preview" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Auth/MauiAuth/MauiAuth.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Auth/MauiAuthBlazor/MauiAuthBlazor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<PropertyGroup>
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
<NetVersion>net7.0</NetVersion>
<NetVersion>net8.0</NetVersion>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -66,7 +66,7 @@
<AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
</PropertyGroup>

<ItemGroup Condition="$(NetVersion) != 'net7.0'">
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.0-preview.7.8842" />
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.0-rc.2.9373" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion DynamicFab/DynamicFab.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions IPTVPlayer/IPTVPlayer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="2.0.0" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions KanbanBoard/KanbanBoard.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down Expand Up @@ -27,9 +27,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.2.23480.1" />
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' or $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) =='maccatalyst' ">
Expand Down
2 changes: 1 addition & 1 deletion MauiAnimation/MauiAnimation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion MauiBank/MauiBank.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
<PackageReference Include="Plugin.Fingerprint" Version="3.0.0-beta.1" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions MauiBells/MauiBells.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down Expand Up @@ -30,6 +30,6 @@
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Plugin.Maui.Audio" Version="2.0.0-preview1" />
<PackageReference Include="Plugin.Maui.Audio" Version="2.0.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions MauiBluetooth/MauiBluetooth.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
<PackageReference Include="Plugin.BLE" Version="3.0.0-beta.5" />
<PackageReference Include="Plugin.BLE" Version="3.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion MauiCaptcha/MauiCaptcha.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion MauiLocalization/MauiLocalization.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion MauiMaps/MauiMaps.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<ItemGroup>
<PackageReference Include="AutoFixture" Version="4.18.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
<PackageReference Include="CommunityToolkit.Maui.Maps" Version="1.0.4" />
</ItemGroup>
Expand Down
7 changes: 1 addition & 6 deletions MauiMarkdown/MauiMarkdown.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,7 @@

<ItemGroup>
<PackageReference Include="M.BindableProperty.Generator" Version="0.11.1" />
<PackageReference Include="Microsoft.Maui.Graphics.Text.Markdig" Version="8.0.0-rc.2.9373" />
</ItemGroup>

<ItemGroup Condition="$(NetVersion) != 'net7.0'">
<PackageReference Include="Microsoft.Maui.Graphics.Text.Markdig" Version="8.0.0-preview.7.8842" />
</ItemGroup>
<ItemGroup Condition="$(NetVersion) == 'net7.0'">
<PackageReference Include="Microsoft.Maui.Graphics.Text.Markdig" Version="7.0.92" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion MauiMultiWindow/MauiMultiWindow.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion MauiPaint/MauiPaint.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
<PackageReference Include="InterfaceConverter.SystemTextJson" Version="1.2.1" />
</ItemGroup>
Expand Down
10 changes: 9 additions & 1 deletion MauiSamples.sln
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "md", "md", "{4C3F6E69-0FB4-
md\thankyou.mdpp = md\thankyou.mdpp
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MauiApplicationInsights", "MauiApplicationInsights\MauiApplicationInsights.csproj", "{0219964A-30DA-4F93-95CB-58F8661F210C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiApplicationInsights", "MauiApplicationInsights\MauiApplicationInsights.csproj", "{0219964A-30DA-4F93-95CB-58F8661F210C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MauiTabView", "MauiTabView\MauiTabView.csproj", "{BD0D8DA8-F153-4C43-B18D-F356CFF02F70}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -353,6 +355,12 @@ Global
{0219964A-30DA-4F93-95CB-58F8661F210C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0219964A-30DA-4F93-95CB-58F8661F210C}.Release|Any CPU.Build.0 = Release|Any CPU
{0219964A-30DA-4F93-95CB-58F8661F210C}.Release|Any CPU.Deploy.0 = Release|Any CPU
{BD0D8DA8-F153-4C43-B18D-F356CFF02F70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BD0D8DA8-F153-4C43-B18D-F356CFF02F70}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD0D8DA8-F153-4C43-B18D-F356CFF02F70}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{BD0D8DA8-F153-4C43-B18D-F356CFF02F70}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD0D8DA8-F153-4C43-B18D-F356CFF02F70}.Release|Any CPU.Build.0 = Release|Any CPU
{BD0D8DA8-F153-4C43-B18D-F356CFF02F70}.Release|Any CPU.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion MauiShellCustomization/MauiShellCustomization.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@

<ItemGroup>
<PackageReference Include="M.BindableProperty.Generator" Version="0.11.1" />
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion MauiSpeech/MauiSpeech.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
<PackageReference Include="OpenAI" Version="1.7.2" />
</ItemGroup>
Expand Down
14 changes: 14 additions & 0 deletions MauiTabView/App.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version = "1.0" encoding = "UTF-8" ?>
<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:MauiTabView"
x:Class="MauiTabView.App">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Resources/Styles/Colors.xaml" />
<ResourceDictionary Source="Resources/Styles/Styles.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>
11 changes: 11 additions & 0 deletions MauiTabView/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace MauiTabView;

public partial class App : Application
{
public App()
{
InitializeComponent();

MainPage = new AppShell();
}
}
15 changes: 15 additions & 0 deletions MauiTabView/AppShell.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Shell
x:Class="MauiTabView.AppShell"
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:MauiTabView"
Shell.FlyoutBehavior="Disabled"
Title="MauiTabView">

<ShellContent
Title="Home"
ContentTemplate="{DataTemplate local:MainPage}"
Route="MainPage" />

</Shell>
9 changes: 9 additions & 0 deletions MauiTabView/AppShell.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
namespace MauiTabView;

public partial class AppShell : Shell
{
public AppShell()
{
InitializeComponent();
}
}
71 changes: 71 additions & 0 deletions MauiTabView/MainPage.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:mauiTabView="clr-namespace:MauiTabView"
x:Class="MauiTabView.MainPage"
x:DataType="mauiTabView:MainPage">

<ScrollView>
<VerticalStackLayout
Spacing="25"
Padding="30,0"
VerticalOptions="Center">
<IndicatorView x:Name="Indicator"
HorizontalOptions="Center">
<IndicatorView.IndicatorTemplate>
<DataTemplate x:DataType="Tab">
<VerticalStackLayout>
<Image Source="{Binding Icon}" />
<Label Text="1" FontSize="14"/>
<Label Text="{Binding Title}" FontSize="12" />
</VerticalStackLayout>
</DataTemplate>
</IndicatorView.IndicatorTemplate>
</IndicatorView>
<CarouselView ItemsSource="{Binding Tabs}"
IndicatorView="{x:Reference Indicator}"
HorizontalScrollBarVisibility="Never"
Loop="False"
Position="0">
<CarouselView.ItemTemplate>
<DataTemplate x:DataType="mauiTabView:Tab">
<ContentPresenter Content="{Binding Content}"/>
</DataTemplate>
</CarouselView.ItemTemplate>
</CarouselView>

<ScrollView Orientation="Horizontal">
<HorizontalStackLayout RadioButtonGroup.GroupName="tabs"
BindableLayout.ItemsSource="{Binding Tabs}"
RadioButtonGroup.SelectedValue="Tab1">
<BindableLayout.ItemTemplate>
<DataTemplate x:DataType="Tab">
<RadioButton Value="{Binding Title}"
Content="{Binding Title}">
</RadioButton>
</DataTemplate>
</BindableLayout.ItemTemplate>
</HorizontalStackLayout>
</ScrollView>

<mauiTabView:TabView>
<mauiTabView:TabView.Tabs>
<mauiTabView:Tab Title="Tab1">
<mauiTabView:Tab.Content>
<Label Text="Tab1 Label"></Label>
</mauiTabView:Tab.Content>
</mauiTabView:Tab>
<mauiTabView:Tab Title="Tab2">
<mauiTabView:Tab.Content>
<Label Text="Tab2 Label"></Label>
</mauiTabView:Tab.Content>
</mauiTabView:Tab>
</mauiTabView:TabView.Tabs>
</mauiTabView:TabView>

<mauiTabView:TabView Tabs="{Binding Tabs2}"/>

</VerticalStackLayout>
</ScrollView>

</ContentPage>
36 changes: 36 additions & 0 deletions MauiTabView/MainPage.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
namespace MauiTabView;

using System.Collections.ObjectModel;
using System.Globalization;

public partial class MainPage : ContentPage
{
public ObservableCollection<Tab> Tabs { get; set; } = new();
public ObservableCollection<Tab> Tabs2 { get; set; } = new();

public MainPage()
{
InitializeComponent();
Tabs.Add(new Tab()
{
Title = "Tab1",
Content = new Label(){Text = "Tab1 Label"}
});
Tabs.Add(new Tab()
{
Title = "Tab2",
Content = new Label(){Text = "Tab2 Label"}
});
Tabs2.Add(new Tab()
{
Title = "Tab1",
Content = new Label(){Text = "Tab1 Label"}
});
Tabs2.Add(new Tab()
{
Title = "Tab2",
Content = new Label(){Text = "Tab2 Label"}
});
BindingContext = this;
}
}
Loading

0 comments on commit b5fb681

Please sign in to comment.