essentials changes for rc2 (#65)

davidortinau · May 5, 2022 · 3ac910b · 3ac910b
1 parent 4c1f69c
commit 3ac910b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/WeatherTwentyOne/GlobalUsings.cs b/src/WeatherTwentyOne/GlobalUsings.cs
@@ -2,14 +2,12 @@
 global using Microsoft.Maui;
 global using Microsoft.Maui.Controls;
 global using Microsoft.Maui.Controls.Hosting;
-global using Microsoft.Maui.Controls.Xaml;
-global using Microsoft.Maui.Essentials;
 global using Microsoft.Maui.Hosting;
 global using WeatherTwentyOne.Services;
 global using System;
 global using System.Collections.Generic;
-global using System.IO;
 global using System.Linq;
 global using System.Net.Http;
-global using System.Threading;
-global using System.Threading.Tasks;
+global using System.Threading.Tasks;
+global using Microsoft.Maui.Devices;
+global using Microsoft.Maui.ApplicationModel;
diff --git a/src/WeatherTwentyOne/Pages/HomePage.xaml.cs b/src/WeatherTwentyOne/Pages/HomePage.xaml.cs
@@ -31,7 +31,7 @@ private void SetupAppActions()
         try
         {
 #if WINDOWS
-            AppActions.IconDirectory = Application.Current.On<WindowsConfiguration>().GetImageDirectory();
+            //AppActions.IconDirectory = Application.Current.On<WindowsConfiguration>().GetImageDirectory();
 #endif
             AppActions.SetAsync(
                 new AppAction("current_info", "Check Current Weather", icon: "current_info"),

diff --git a/src/WeatherTwentyOne/Platforms/Windows/App.xaml.cs b/src/WeatherTwentyOne/Platforms/Windows/App.xaml.cs
@@ -25,6 +25,6 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
     {
         base.OnLaunched(args);
 
-        Microsoft.Maui.Essentials.Platform.OnLaunched(args);
+        //Microsoft.Maui.Essentials.Platform.OnLaunched(args);
     }
 }
diff --git a/src/WeatherTwentyOne/WeatherTwentyOne.csproj b/src/WeatherTwentyOne/WeatherTwentyOne.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks>net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
 	<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>
 
     <OutputType>Exe</OutputType>
@@ -38,12 +38,10 @@
     <MauiSplashScreen Include="Resources\appiconfg.svg" Color="#081B25" />
     <MauiImage Include="Resources\Images\*" />
     <MauiFont Include="Resources\Fonts\*" />
+	<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 
 	<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
-		<!-- Required - WinUI does not yet have buildTransitive for everything -->
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
-		<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.30" />
 		<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.0.1" />
 		<PackageReference Include="PInvoke.User32" Version="0.7.104" />
 	</ItemGroup>
@@ -62,7 +60,7 @@
 		<OutputType>WinExe</OutputType>
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 	</PropertyGroup>
-    
-    <ProjectExtensions><VisualStudio><UserProperties XamarinHotReloadGenericExceptionInfoBarWeatherTwentyOneHideInfoBar="True" /></VisualStudio></ProjectExtensions>
+
+   <ProjectExtensions><VisualStudio><UserProperties XamarinHotReloadGenericExceptionInfoBarWeatherTwentyOneHideInfoBar="True" /></VisualStudio></ProjectExtensions>
 
 </Project>