Merge branch 'dabritch-net9' of https://github.com/dotnet/maui-samples …

…into dabritch-net9
dotnet · Oct 30, 2024 · f5cbc3d · f5cbc3d
2 parents 286e6f5 + cc837d9
commit f5cbc3d
Show file tree

Hide file tree

Showing 334 changed files with 124 additions and 5,370 deletions.
diff --git a/8.0/Tutorials/ConvertToMvvm/code/README.md b/8.0/Tutorials/ConvertToMvvm/code/README.md
diff --git a/8.0/Tutorials/CreateNetMauiApp/code/README.md b/8.0/Tutorials/CreateNetMauiApp/code/README.md
diff --git a/9.0/Animations/Animations/Animations.csproj b/9.0/Animations/Animations/Animations.csproj
@@ -49,7 +49,7 @@
 
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />
-		<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
+		<MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" />
 
 		<!-- Custom Fonts -->
 		<MauiFont Include="Resources\Fonts\*" />
@@ -61,7 +61,7 @@
 	<ItemGroup>
 	  <PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.1.24431.7" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.2.24473.5" />
 	</ItemGroup>
 
 </Project>
diff --git a/9.0/Animations/Animations/Resources/Images/dotnet_bot.png b/9.0/Animations/Animations/Resources/Images/dotnet_bot.png
diff --git a/9.0/Animations/Animations/Resources/Images/dotnet_bot.svg b/9.0/Animations/Animations/Resources/Images/dotnet_bot.svg
diff --git a/8.0/Animations/README.md → 9.0/Animations/README.md b/8.0/Animations/README.md → 9.0/Animations/README.md
diff --git a/9.0/Apps/BugSweeper/BugSweeper/BugSweeper.csproj b/9.0/Apps/BugSweeper/BugSweeper/BugSweeper.csproj
@@ -66,7 +66,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.1.24431.7" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.2.24473.5" />
 	</ItemGroup>
 
 </Project>
diff --git a/9.0/Apps/BugSweeper/BugSweeper/Resources/Images/dotnet_bot.png b/9.0/Apps/BugSweeper/BugSweeper/Resources/Images/dotnet_bot.png
diff --git a/8.0/Apps/BugSweeper/README.md → 9.0/Apps/BugSweeper/README.md b/8.0/Apps/BugSweeper/README.md → 9.0/Apps/BugSweeper/README.md
diff --git a/8.0/Apps/Calculator/README.md → 9.0/Apps/Calculator/README.md b/8.0/Apps/Calculator/README.md → 9.0/Apps/Calculator/README.md
diff --git a/9.0/Apps/Calculator/src/Calculator/Calculator.csproj b/9.0/Apps/Calculator/src/Calculator/Calculator.csproj
@@ -49,6 +49,7 @@
 
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />
+		<MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" />
 		<MauiFont Include="Resources\Fonts\*" />
 
 		<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
@@ -57,7 +58,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.1.24431.7" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.2.24473.5" />
 	</ItemGroup>
 
 </Project>
diff --git a/9.0/Apps/Calculator/src/Calculator/Resources/Images/dotnet_bot.png b/9.0/Apps/Calculator/src/Calculator/Resources/Images/dotnet_bot.png