Update mcs-winui3-app template to latest stable NuGets for C# Markup …

…2, Windows App SDK and Uno Platform; remove unused Uno dependencies on Windows
Applicita · Jun 19, 2023 · 3faad7b · 3faad7b
1 parent e9b360e
commit 3faad7b
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 41 deletions.
diff --git a/src/Modern.CSharp.Templates.csproj b/src/Modern.CSharp.Templates.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <PackageId>Modern.CSharp.Templates</PackageId>
-        <PackageVersion>1.2.2</PackageVersion>
+        <PackageVersion>1.3.0</PackageVersion>
         <PackageType>Template</PackageType>
         <Title>Modern C# 11 Templates</Title>
         <Description>A toolkit of modern dotnet new templates for C# 11, .NET 7, Microsoft Orleans 7, Windows App SDK and Uno Platform</Description>

diff --git a/src/Readme.md b/src/Readme.md
@@ -25,4 +25,4 @@ Promotes conciseness, readability and leveraging the latest language features.
 
 The Orleans templates can be combined with [Orleans.Multitenant](https://github.com/Applicita/Orleans.Multitenant) for secure, flexible tenant separation in Microsoft Orleans 7
 
-[Release Notes](https://github.com/Applicita/Modern.CSharp.Templates/releases/tag/1-2-0)
+[Release Notes](https://github.com/Applicita/Modern.CSharp.Templates/releases/tag/1-3-0)
diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Mobile/UnoWinUIQuickStart.Mobile.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Mobile/UnoWinUIQuickStart.Mobile.csproj
@@ -48,11 +48,11 @@
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.WinUI" Version="4.7.44" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.44" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.44" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.44" />
+    <PackageReference Include="Uno.WinUI" Version="4.9.20" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.20" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.20" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="4.9.20" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(TargetFramework)'=='net7.0-android'">

diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Server/UnoWinUIQuickStart.Server.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Server/UnoWinUIQuickStart.Server.csproj
@@ -16,7 +16,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.Wasm.Bootstrap.Server" Version="7.0.0-dev.195" />
+		<PackageReference Include="Uno.Wasm.Bootstrap.Server" Version="7.0.24" />
 	</ItemGroup>
 #endif -->
 

diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Skia.Gtk/UnoWinUIQuickStart.Skia.Gtk.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Skia.Gtk/UnoWinUIQuickStart.Skia.Gtk.csproj
@@ -15,11 +15,11 @@
     <Content Include="..\UnoWinUIQuickStart.Windows\Images\StoreLogo.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.7.44" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.44" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.44" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.44" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+    <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.9.20" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.20" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.20" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="4.9.20" />
     <PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
     <PackageReference Include="SkiaSharp.Skottie" Version="2.88.3" />
   </ItemGroup>

diff --git a/...noWinUIQuickStart.Skia.Linux.FrameBuffer/UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj b/...noWinUIQuickStart.Skia.Linux.FrameBuffer/UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj
@@ -15,11 +15,11 @@
     <Content Include="..\UnoWinUIQuickStart.Windows\Images\StoreLogo.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.7.44" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.44" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.44" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.44" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+    <PackageReference Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.9.20" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.20" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.20" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="4.9.20" />
     <PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
     <PackageReference Include="SkiaSharp.Skottie" Version="2.88.3" />
   </ItemGroup>

diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Skia.WPF/UnoWinUIQuickStart.Skia.WPF.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Skia.WPF/UnoWinUIQuickStart.Skia.WPF.csproj
@@ -23,11 +23,11 @@
     </AssemblyAttribute>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.7.44" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.44" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.44" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.44" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+    <PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.9.20" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.20" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.20" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="4.9.20" />
     <PackageReference Include="SkiaSharp.Skottie" Version="2.88.3" />
     <PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
   </ItemGroup>

diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Wasm/UnoWinUIQuickStart.Wasm.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Wasm/UnoWinUIQuickStart.Wasm.csproj
@@ -59,15 +59,15 @@
     <None Include="wwwroot\web.config" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.3" />
     <PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
-    <PackageReference Include="Uno.WinUI.WebAssembly" Version="4.7.44" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.44" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.44" />
-    <PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.11" />
-    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.11" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.44" />
+    <PackageReference Include="Uno.WinUI.WebAssembly" Version="4.9.20" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.20" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.20" />
+    <PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.24" />
+    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.24" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="4.9.20" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\UnoWinUIQuickStart\UnoWinUIQuickStart.csproj" />

diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj
@@ -23,11 +23,9 @@
     <Content Include="Images\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230217.4" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
-    <PackageReference Include="Uno.WinUI" Version="4.7.44" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230602002" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
 	<PackageReference Include="KeyboardHookLite" Version="1.1.3" Condition=" '$(Configuration)' == 'Debug' " />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>

diff --git a/src/WinUI3-App/UnoWinUIQuickStart/UnoWinUIQuickStart.csproj b/src/WinUI3-App/UnoWinUIQuickStart/UnoWinUIQuickStart.csproj
@@ -33,15 +33,15 @@
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
-    <PackageReference Include="Uno.WinUI" Version="4.7.44" />
-	<PackageReference Include="CSharpMarkup.WinUI" Version="2.0.0" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
+    <PackageReference Include="Uno.WinUI" Version="4.9.20" />
+	<PackageReference Include="CSharpMarkup.WinUI" Version="2.1.14" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
     <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0-windows10.0.18362'">
-	<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230217.4" />
+	<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230602002" />
 	<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22621.28" />
 	<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22621.28" />
   </ItemGroup>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,4 +25,4 @@ Promotes conciseness, readability and leveraging the latest language features.

		The Orleans templates can be combined with [Orleans.Multitenant](https://github.com/Applicita/Orleans.Multitenant) for secure, flexible tenant separation in Microsoft Orleans 7

		[Release Notes](https://github.com/Applicita/Modern.CSharp.Templates/releases/tag/1-2-0)
		[Release Notes](https://github.com/Applicita/Modern.CSharp.Templates/releases/tag/1-3-0)