Merge pull request #63 from telerik/pipelines/latest-9.0.0-apps-17-Ja…

…n-16-13 New version of Progress UI for .Net Maui samples with the 9.0.0 release changes.
telerik · Jan 23, 2025 · 167f01c · 167f01c
2 parents fc650d3 + 5b9e582
commit 167f01c
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 25 deletions.
diff --git a/Samples/AppUtils/AppUtils.csproj b/Samples/AppUtils/AppUtils.csproj
@@ -17,16 +17,12 @@
 
 	<ItemGroup Condition="$(TargetFramework.Contains('net8'))">
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet8Version) == '' " Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet8Version) == '' " Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet8Version) != '' " Version="$(CustomMauiNet8Version)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet8Version) != '' " Version="$(CustomMauiNet8Version)" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$(TargetFramework.Contains('net9'))">
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet9Version) == '' " Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet9Version) == '' " Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet9Version) != '' " Version="$(CustomMauiNet9Version)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet9Version) != '' " Version="$(CustomMauiNet9Version)" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(SolutionName)' != 'Telerik.Maui' And '$(UseSourceProjects)' != 'True' And '$(UseSourceAssemblies)' != 'True'">

diff --git a/Samples/ControlsSamples/ControlsSamples.csproj b/Samples/ControlsSamples/ControlsSamples.csproj
@@ -105,17 +105,13 @@
 
 	<ItemGroup Condition="$(TargetFramework.Contains('net8'))">
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet8Version) == '' " Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet8Version) == '' " Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet8Version) != '' " Version="$(CustomMauiNet8Version)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet8Version) != '' " Version="$(CustomMauiNet8Version)" />
 		<PackageReference Include="System.Text.Json" Version="8.0.5" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$(TargetFramework.Contains('net9'))">
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet9Version) == '' " Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet9Version) == '' " Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet9Version) != '' " Version="$(CustomMauiNet9Version)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet9Version) != '' " Version="$(CustomMauiNet9Version)" />
 		<PackageReference Include="System.Text.Json" Version="9.0.0-preview.6.24327.7" />
 	</ItemGroup>
 

diff --git a/Samples/ControlsSamples/Examples/DataGridControl/Common/Order.cs b/Samples/ControlsSamples/Examples/DataGridControl/Common/Order.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Xml.Serialization;
 using QSF.ViewModels;
-using Telerik.Maui.Controls.Compatibility.Common.DataAnnotations;
 
 namespace QSF.Examples.DataGridControl.Common
 {
@@ -24,23 +23,20 @@ public class Order : ViewModelBase
         private string shipRegion;
 
         [XmlAttribute(AttributeName = "OrderID")]
-        [DisplayOptions(Header = "Order ID", PlaceholderText = "Order ID")]
         public int OrderID
         {
             get => this.orderID;
             set => this.UpdateValue(ref this.orderID, value);
         }
 
         [XmlAttribute(AttributeName = "ShipName")]
-        [DisplayOptions(Header = "Ship Name", PlaceholderText = "Ship Name")]
         public string ShipName
         {
             get => this.shipName;
             set => this.UpdateValue(ref this.shipName, value);
         }
 
         [XmlAttribute(AttributeName = "CustomerID")]
-        [DisplayOptions(Header = "Customer ID", PlaceholderText = "Customer ID")]
         public string CustomerID
         {
             get => this.customerID;
@@ -62,7 +58,6 @@ public string EmployeeImage
         }
 
         [XmlAttribute(AttributeName = "OrderDate")]
-        [DisplayOptions(Header = "Order Date", PlaceholderText = "Order Date")]
         public DateTime OrderDate
         {
             get => this.orderDate;
@@ -77,23 +72,20 @@ public DateTime RequiredDate
         }
 
         [XmlAttribute(AttributeName = "ShippedDate")]
-        [DisplayOptions(Header = "Shipped Date", PlaceholderText = "Shipped Date")]
         public DateTime ShippedDate
         {
             get => this.shippedDate;
             set => this.UpdateValue(ref this.shippedDate, value);
         }
 
         [XmlAttribute(AttributeName = "ShipVia")]
-        [DisplayOptions(Header = "Ship Via", PlaceholderText = "Ship Via")]
         public double ShipVia
         {
             get => this.shipVia;
             set => this.UpdateValue(ref this.shipVia, value);
         }
 
         [XmlAttribute(AttributeName = "Freight")]
-        [DisplayOptions(Header = "Freight", PlaceholderText = "Freight")]
         public double Freight
         {
             get => this.freight;

diff --git a/Samples/ControlsSamples/MauiProgram.cs b/Samples/ControlsSamples/MauiProgram.cs
@@ -1,6 +1,5 @@
 using Microsoft.Maui;
 using Microsoft.Maui.Hosting;
-using Microsoft.Maui.Controls.Compatibility;
 using Microsoft.Maui.Controls.Hosting;
 using Microsoft.Maui.Controls;
 using Microsoft.Extensions.DependencyInjection.Extensions;

diff --git a/Samples/CryptoTracker/CryptoTracker.csproj b/Samples/CryptoTracker/CryptoTracker.csproj
@@ -45,16 +45,12 @@
 
 	<ItemGroup Condition="$(TargetFramework.Contains('net8'))">
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet8Version) == '' " Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet8Version) == '' " Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet8Version) != '' " Version="$(CustomMauiNet8Version)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet8Version) != '' " Version="$(CustomMauiNet8Version)" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$(TargetFramework.Contains('net9'))">
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet9Version) == '' " Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet9Version) == '' " Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet9Version) != '' " Version="$(CustomMauiNet9Version)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet9Version) != '' " Version="$(CustomMauiNet9Version)" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">

diff --git a/Samples/SdkBrowser/SDKBrowserMaui.csproj b/Samples/SdkBrowser/SDKBrowserMaui.csproj
@@ -51,16 +51,12 @@
 
 	<ItemGroup Condition="$(TargetFramework.Contains('net8'))">
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet8Version) == '' " Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet8Version) == '' " Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet8Version) != '' " Version="$(CustomMauiNet8Version)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet8Version) != '' " Version="$(CustomMauiNet8Version)" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$(TargetFramework.Contains('net9'))">
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet9Version) == '' " Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet9Version) == '' " Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls" Condition=" $(CustomMauiNet9Version) != '' " Version="$(CustomMauiNet9Version)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Condition=" $(CustomMauiNet9Version) != '' " Version="$(CustomMauiNet9Version)" />
 	</ItemGroup>
 
 	<ItemGroup>