Merge pull request #818 from unoplatform/dev/ks/samples-update-mvux-bindableProxy

agneszitte · web-flow · commit e470a0a944bb · 2024-09-26T14:48:48.000-04:00
chore: update samples for MVUX generated class
diff --git a/reference/Counter/CSharp-MVUX/Counter/Counter.csproj b/reference/Counter/CSharp-MVUX/Counter/Counter.csproj
@@ -39,5 +39,6 @@
       CSharpMarkup;
       MVUX;
     </UnoFeatures>
+    <WindowsSdkPackageVersion>10.0.19041.38</WindowsSdkPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/reference/Counter/CSharp-MVUX/Counter/GlobalUsings.cs b/reference/Counter/CSharp-MVUX/Counter/GlobalUsings.cs
@@ -1,5 +1,6 @@
-﻿global using System.Collections.Immutable;
+global using System.Collections.Immutable;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Logging;
 global using ApplicationExecutionState = Windows.ApplicationModel.Activation.ApplicationExecutionState;
 global using Color = Windows.UI.Color;
+[assembly: Uno.Extensions.Reactive.Config.BindableGenerationTool(3)]
diff --git a/reference/Counter/CSharp-MVUX/Counter/MainPage.cs b/reference/Counter/CSharp-MVUX/Counter/MainPage.cs
@@ -4,7 +4,7 @@ public sealed partial class MainPage : Page
 {
     public MainPage()
     {
-        this.DataContext(new BindableMainModel(), (page, vm) => page
+        this.DataContext(new MainViewModel(), (page, vm) => page
             .Background(ThemeResource.Get<Brush>("ApplicationPageBackgroundThemeBrush"))
             .Content(
                 new StackPanel()
@@ -36,4 +36,4 @@ public MainPage()
             )
         );
     }
-}
+}
diff --git a/reference/Counter/CSharp-MVUX/global.json b/reference/Counter/CSharp-MVUX/global.json
@@ -1,6 +1,6 @@
 {
   // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-    "Uno.Sdk": "5.3.90"
+    "Uno.Sdk": "5.4.5"
   }
 }
diff --git a/reference/Counter/XAML-MVUX/Counter/Counter.csproj b/reference/Counter/XAML-MVUX/Counter/Counter.csproj
@@ -38,5 +38,6 @@
     <UnoFeatures>
       MVUX;
     </UnoFeatures>
+    <WindowsSdkPackageVersion>10.0.19041.38</WindowsSdkPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/reference/Counter/XAML-MVUX/Counter/GlobalUsings.cs b/reference/Counter/XAML-MVUX/Counter/GlobalUsings.cs
@@ -1,4 +1,5 @@
-﻿global using System.Collections.Immutable;
+global using System.Collections.Immutable;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Logging;
 global using ApplicationExecutionState = Windows.ApplicationModel.Activation.ApplicationExecutionState;
+[assembly: Uno.Extensions.Reactive.Config.BindableGenerationTool(3)]
diff --git a/reference/Counter/XAML-MVUX/Counter/MainPage.xaml b/reference/Counter/XAML-MVUX/Counter/MainPage.xaml
@@ -5,7 +5,7 @@
 	xmlns:local="using:Counter"
 	Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 	<Page.DataContext>
-		<local:BindableMainModel />
+		<local:MainViewModel />
 	</Page.DataContext>
 	<StackPanel VerticalAlignment="Center">
 		<Image
diff --git a/reference/Counter/XAML-MVUX/global.json b/reference/Counter/XAML-MVUX/global.json
@@ -1,6 +1,6 @@
 {
   // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-    "Uno.Sdk": "5.3.90"
+    "Uno.Sdk": "5.4.5"
   }
 }
diff --git a/reference/SimpleCalc/CSharp-MVUX/SimpleCalculator/GlobalUsings.cs b/reference/SimpleCalc/CSharp-MVUX/SimpleCalculator/GlobalUsings.cs
@@ -1,5 +1,6 @@
-﻿global using System.Collections.Immutable;
+global using System.Collections.Immutable;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Logging;
 global using ApplicationExecutionState = Windows.ApplicationModel.Activation.ApplicationExecutionState;
 global using Color = Windows.UI.Color;
+[assembly: Uno.Extensions.Reactive.Config.BindableGenerationTool(3)]
diff --git a/reference/SimpleCalc/CSharp-MVUX/SimpleCalculator/MainPage.cs b/reference/SimpleCalc/CSharp-MVUX/SimpleCalculator/MainPage.cs
@@ -10,7 +10,7 @@ public sealed partial class MainPage : Page
 {
 	public MainPage()
 	{
-		this.DataContext(new BindableMainModel(this.GetThemeService()), (page, vm)
+		this.DataContext(new MainViewModel(this.GetThemeService()), (page, vm)
 			=> page
 			.Resources(r => r
 				.Add(AppIcons.Dark)
@@ -39,7 +39,7 @@ public MainPage()
 		);
 	}
 
-	private ToggleButton Header(BindableMainModel vm)
+	private ToggleButton Header(MainViewModel vm)
 		=> new ToggleButton()
 			.Grid(row: 0)
 			.Margin(8, 24, 8, 0)
@@ -63,7 +63,7 @@ private ToggleButton Header(BindableMainModel vm)
 					.Foreground(Theme.Brushes.Primary.Default)
 			);
 
-	private StackPanel Output(BindableMainModel vm) =>
+	private StackPanel Output(MainViewModel vm) =>
 		new StackPanel()
 		.Grid(row: 2)
 		.Spacing(16)
@@ -75,21 +75,21 @@ private StackPanel Output(BindableMainModel vm) =>
 			Result(vm)
 		);
 
-	private TextBlock Equation(BindableMainModel vm) =>
+	private TextBlock Equation(MainViewModel vm) =>
 		new TextBlock()
 		.Text(() => vm.Calculator.Equation)
 		.HorizontalAlignment(HorizontalAlignment.Right)
 		.Foreground(Theme.Brushes.OnSecondary.Container.Default)
 		.Style(Theme.TextBlock.Styles.DisplaySmall);
 
-	private TextBlock Result(BindableMainModel vm) =>
+	private TextBlock Result(MainViewModel vm) =>
 		new TextBlock()
 		.Text(() => vm.Calculator.Output)
 		.HorizontalAlignment(HorizontalAlignment.Right)
 		.Foreground(Theme.Brushes.OnBackground.Default)
 		.Style(Theme.TextBlock.Styles.DisplayLarge);
 
-	private Grid KeyPad(BindableMainModel vm)
+	private Grid KeyPad(MainViewModel vm)
 		=> new Grid()
 		.Grid(row: 3)
 		.RowSpacing(16)
@@ -132,7 +132,7 @@ private Grid KeyPad(BindableMainModel vm)
 		);
 
 	private Button KeyPadButton(
-			BindableMainModel vm,
+			MainViewModel vm,
 			int gridRow,
 			int gridColumn,
 			object content,
@@ -150,7 +150,7 @@ private Button KeyPadButton(
 			.Style(Theme.Button.Styles.Elevated);
 
 	private Button KeyPadPrimaryButton(
-			BindableMainModel vm,
+			MainViewModel vm,
 			int gridRow,
 			int gridColumn,
 			object content,
@@ -167,7 +167,7 @@ private Button KeyPadPrimaryButton(
 			.Style(Theme.Button.Styles.Filled);
 
 	private Button KeyPadSecondaryButton(
-			BindableMainModel vm,
+			MainViewModel vm,
 			int gridRow,
 			int gridColumn,
 			object content,
diff --git a/reference/SimpleCalc/CSharp-MVUX/SimpleCalculator/SimpleCalculator.csproj b/reference/SimpleCalc/CSharp-MVUX/SimpleCalculator/SimpleCalculator.csproj
@@ -43,6 +43,7 @@
       MVUX;
       ExtensionsCore;
     </UnoFeatures>
+    <WindowsSdkPackageVersion>10.0.19041.38</WindowsSdkPackageVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/reference/SimpleCalc/CSharp-MVUX/global.json b/reference/SimpleCalc/CSharp-MVUX/global.json
@@ -1,6 +1,6 @@
 {
   // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-    "Uno.Sdk": "5.3.90"
+    "Uno.Sdk": "5.4.5"
   }
 }
diff --git a/reference/SimpleCalc/XAML-MVUX/SimpleCalculator/GlobalUsings.cs b/reference/SimpleCalc/XAML-MVUX/SimpleCalculator/GlobalUsings.cs
@@ -1,4 +1,5 @@
-﻿global using System.Collections.Immutable;
+global using System.Collections.Immutable;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Logging;
 global using ApplicationExecutionState = Windows.ApplicationModel.Activation.ApplicationExecutionState;
+[assembly: Uno.Extensions.Reactive.Config.BindableGenerationTool(3)]
diff --git a/reference/SimpleCalc/XAML-MVUX/SimpleCalculator/MainPage.xaml.cs b/reference/SimpleCalc/XAML-MVUX/SimpleCalculator/MainPage.xaml.cs
@@ -8,6 +8,6 @@ public sealed partial class MainPage : Page
 	public MainPage()
 	{
 		this.InitializeComponent();
-		DataContext = new BindableMainModel(this.GetThemeService());
+		DataContext = new MainViewModel(this.GetThemeService());
 	}
 }
diff --git a/reference/SimpleCalc/XAML-MVUX/SimpleCalculator/SimpleCalculator.csproj b/reference/SimpleCalc/XAML-MVUX/SimpleCalculator/SimpleCalculator.csproj
@@ -41,6 +41,7 @@
       MVUX;
       ExtensionsCore;
     </UnoFeatures>
+    <WindowsSdkPackageVersion>10.0.19041.38</WindowsSdkPackageVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/reference/SimpleCalc/XAML-MVUX/global.json b/reference/SimpleCalc/XAML-MVUX/global.json
@@ -1,6 +1,6 @@
 {
   // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-    "Uno.Sdk": "5.3.90"
+    "Uno.Sdk": "5.4.5"
   }
 }
diff --git a/reference/TubePlayer/src/Directory.Build.props b/reference/TubePlayer/src/Directory.Build.props
@@ -13,10 +13,4 @@
     <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <UnoExtensionsVersion>4.1.23</UnoExtensionsVersion>
-    <UnoToolkitVersion>6.0.24</UnoToolkitVersion>
-    <UnoThemesVersion>5.0.13</UnoThemesVersion>
-    <UnoCSharpMarkupVersion>5.2.14</UnoCSharpMarkupVersion>
-  </PropertyGroup>
 </Project>
diff --git a/reference/TubePlayer/src/TubePlayer/GlobalUsings.cs b/reference/TubePlayer/src/TubePlayer/GlobalUsings.cs
@@ -30,3 +30,4 @@
 global using Microsoft.UI.Text;
 global using Refit;
 global using TubePlayer.Services;
+[assembly: Uno.Extensions.Reactive.Config.BindableGenerationTool(3)]
diff --git a/reference/TubePlayer/src/TubePlayer/Presentation/MainPage.cs b/reference/TubePlayer/src/TubePlayer/Presentation/MainPage.cs
@@ -17,7 +17,7 @@ public partial class MainPage : Page
 {
     public MainPage()
     {
-        this.DataContext<BindableMainModel>((page, vm) => page
+        this.DataContext<MainViewModel>((page, vm) => page
             .Background(Theme.Brushes.Background.Default)
             .NavigationCacheMode(NavigationCacheMode.Required)
             .StatusBar
diff --git a/reference/TubePlayer/src/TubePlayer/Presentation/VideoDetailsPage.cs b/reference/TubePlayer/src/TubePlayer/Presentation/VideoDetailsPage.cs
@@ -14,7 +14,7 @@ public partial class VideoDetailsPage : Page
 
     public VideoDetailsPage()
     {
-        this.DataContext<BindableVideoDetailsModel>((page, vm) => page
+        this.DataContext<VideoDetailsViewModel>((page, vm) => page
             .Background(Theme.Brushes.Background.Default)
             .NavigationCacheMode(NavigationCacheMode.Required)
             .StatusBar
diff --git a/reference/TubePlayer/src/TubePlayer/TubePlayer.csproj b/reference/TubePlayer/src/TubePlayer/TubePlayer.csproj
@@ -46,6 +46,7 @@
       Http;
       MediaElement;
     </UnoFeatures>
+  <WindowsSdkPackageVersion>10.0.19041.38</WindowsSdkPackageVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/reference/TubePlayer/src/global.json b/reference/TubePlayer/src/global.json
@@ -1,6 +1,6 @@
 {
   // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-    "Uno.Sdk": "5.2.139"
+    "Uno.Sdk": "5.4.5"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ public sealed partial class MainPage : Page`
`4`	`4`	`{`
`5`	`5`	`public MainPage()`
`6`	`6`	`{`
`7`		`- this.DataContext(new BindableMainModel(), (page, vm) => page`
	`7`	`+ this.DataContext(new MainViewModel(), (page, vm) => page`
`8`	`8`	`.Background(ThemeResource.Get<Brush>("ApplicationPageBackgroundThemeBrush"))`
`9`	`9`	`.Content(`
`10`	`10`	`new StackPanel()`
`@@ -36,4 +36,4 @@ public MainPage()`
`36`	`36`	`)`
`37`	`37`	`);`
`38`	`38`	`}`
`39`		`-}`
	`39`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`// To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.`
`3`	`3`	`"msbuild-sdks": {`
`4`		`- "Uno.Sdk": "5.3.90"`
	`4`	`+ "Uno.Sdk": "5.4.5"`
`5`	`5`	`}`
`6`	`6`	`}`