updating msbuild.slnf and nomsbuild.slnf

IOL0ol1 · Sep 27, 2023 · f190b5a · f190b5a
1 parent 1029d38
commit f190b5a
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 14 deletions.
diff --git a/Mapsui.MSBuild.slnf b/Mapsui.MSBuild.slnf
@@ -11,7 +11,6 @@
       "Mapsui.UI.Forms\\Mapsui.UI.Forms.csproj",
       "Mapsui.UI.MapView\\Mapsui.UI.MapView.shproj",
       "Mapsui.UI.Shared\\Mapsui.UI.Shared.shproj",
-      "Mapsui.UI.Uno\\Mapsui.UI.Uno.csproj",
       "Mapsui\\Mapsui.csproj",
       "Samples\\Mapsui.Samples.Common\\Mapsui.Samples.Common.csproj",
       "Samples\\Mapsui.Samples.CustomWidget\\Mapsui.Samples.CustomWidget.csproj",
@@ -21,13 +20,7 @@
       "Samples\\Mapsui.Samples.Forms\\Mapsui.Samples.Forms.UWP\\Mapsui.Samples.Forms.UWP.csproj",
       "Samples\\Mapsui.Samples.Forms\\Mapsui.Samples.Forms.WPF\\Mapsui.Samples.Forms.WPF.csproj",
       "Samples\\Mapsui.Samples.Forms\\Mapsui.Samples.Forms.iOS\\Mapsui.Samples.Forms.iOS.csproj",
-      "Samples\\Mapsui.Samples.MapView\\Mapsui.Samples.MapView.shproj",
-      "Samples\\Mapsui.Samples.Uno\\Mapsui.Samples.Uno.Mobile\\Mapsui.Samples.Uno.Mobile.csproj",
-      "Samples\\Mapsui.Samples.Uno\\Mapsui.Samples.Uno.Shared\\Mapsui.Samples.Uno.Shared.shproj",
-      "Samples\\Mapsui.Samples.Uno\\Mapsui.Samples.Uno.Skia.Gtk\\Mapsui.Samples.Uno.Skia.Gtk.csproj",
-      "Samples\\Mapsui.Samples.Uno\\Mapsui.Samples.Uno.Skia.Linux.FrameBuffer\\Mapsui.Samples.Uno.Skia.Linux.FrameBuffer.csproj",
-      "Samples\\Mapsui.Samples.Uno\\Mapsui.Samples.Uno.Skia.Wpf\\Mapsui.Samples.Uno.Skia.Wpf.csproj",
-      "Samples\\Mapsui.Samples.Uno\\Mapsui.Samples.Uno.Wasm\\Mapsui.Samples.Uno.Wasm.csproj"
+      "Samples\\Mapsui.Samples.MapView\\Mapsui.Samples.MapView.shproj"
     ]
   }
 }
diff --git a/Mapsui.NoMSBuild.slnf b/Mapsui.NoMSBuild.slnf
@@ -17,6 +17,7 @@
       "Mapsui.UI.Maui\\Mapsui.UI.Maui.csproj",
       "Mapsui.UI.Shared\\Mapsui.UI.Shared.shproj",
       "Mapsui.UI.Uno.WinUI\\Mapsui.UI.Uno.WinUI.csproj",
+      "Mapsui.UI.Uno\\Mapsui.UI.Uno.csproj",
       "Mapsui.UI.WinUI\\Mapsui.UI.WinUI.csproj",
       "Mapsui.UI.Wpf\\Mapsui.UI.Wpf.csproj",
       "Mapsui.UI.iOS\\Mapsui.UI.iOS.csproj",
@@ -40,6 +41,12 @@
       "Samples\\Mapsui.Samples.Uno.WinUI\\Mapsui.Samples.Uno.WinUI.Wasm\\Mapsui.Samples.Uno.WinUI.Wasm.csproj",
       "Samples\\Mapsui.Samples.Uno.WinUI\\Mapsui.Samples.Uno.WinUI.Windows\\Mapsui.Samples.Uno.WinUI.Windows.csproj",
       "Samples\\Mapsui.Samples.Uno.WinUI\\Mapsui.Samples.Uno.WinUI\\Mapsui.Samples.Uno.WinUI.csproj",
+      "Samples\\Mapsui.Samples.Uno\\Mapsui.Samples.Uno.Mobile\\Mapsui.Samples.Uno.Mobile.csproj",
+      "Samples\\Mapsui.Samples.Uno\\Mapsui.Samples.Uno.Shared\\Mapsui.Samples.Uno.Shared.shproj",
+      "Samples\\Mapsui.Samples.Uno\\Mapsui.Samples.Uno.Skia.Gtk\\Mapsui.Samples.Uno.Skia.Gtk.csproj",
+      "Samples\\Mapsui.Samples.Uno\\Mapsui.Samples.Uno.Skia.Linux.FrameBuffer\\Mapsui.Samples.Uno.Skia.Linux.FrameBuffer.csproj",
+      "Samples\\Mapsui.Samples.Uno\\Mapsui.Samples.Uno.Skia.Wpf\\Mapsui.Samples.Uno.Skia.Wpf.csproj",
+      "Samples\\Mapsui.Samples.Uno\\Mapsui.Samples.Uno.Wasm\\Mapsui.Samples.Uno.Wasm.csproj",
       "Samples\\Mapsui.Samples.WinUI\\Mapsui.Samples.WinUI\\Mapsui.Samples.WinUI.csproj",
       "Samples\\Mapsui.Samples.Wpf\\Mapsui.Samples.Wpf.csproj",
       "Samples\\Mapsui.Samples.iOS\\Mapsui.Samples.iOS.csproj",

diff --git a/Samples/Mapsui.Samples.Maui.MapView/Mapsui.Samples.Maui.MapView.csproj b/Samples/Mapsui.Samples.Maui.MapView/Mapsui.Samples.Maui.MapView.csproj
@@ -35,10 +35,10 @@
 
   <ItemGroup>
     <!-- App Icon -->
-    <MauiIcon Include="Resources\appicon.svg" ForegroundFile="Resources\appiconfg.svg" Color="#512BD4" />
+    <AndroidResource Include="Resources\appicon.svg" ForegroundFile="Resources\appiconfg.svg" Color="#512BD4" />
 
     <!-- Splash Screen -->
-    <MauiSplashScreen Include="Resources\appiconfg.svg" Color="#512BD4" />
+    <AndroidResource Include="Resources\appiconfg.svg" Color="#512BD4" />
 
     <!-- Images -->
     <MauiImage Include="Resources\Images\*" />
@@ -55,6 +55,16 @@
   </ItemGroup>
 
   <ItemGroup>
+    <MauiFont Remove="Resources\Fonts\OpenSansRegular.ttf" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <MauiImage Remove="Resources\Images\dotnet_bot.svg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AndroidResource Include="Resources\Fonts\OpenSansRegular.ttf" />
+    <AndroidResource Include="Resources\Images\dotnet_bot.svg" />
     <AndroidResource Include="Resources\Raw\AboutAssets.txt" />
   </ItemGroup>
 

diff --git a/Samples/Mapsui.Samples.Maui/Mapsui.Samples.Maui.csproj b/Samples/Mapsui.Samples.Maui/Mapsui.Samples.Maui.csproj
@@ -32,21 +32,35 @@
 
 	<ItemGroup>
 		<!-- App Icon -->
-		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
+		<AndroidResource Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
+		<AndroidResource Include="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
 
 		<!-- Splash Screen -->
-		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
+		<AndroidResource Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
 
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />
-		<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
 
 		<!-- Custom Fonts -->
 		<MauiFont Include="Resources\Fonts\*" />
 
 		<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
 		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 	</ItemGroup>
+
+	<ItemGroup>
+	  <MauiFont Remove="Resources\Fonts\OpenSans-Regular.ttf" />
+	  <MauiFont Remove="Resources\Fonts\OpenSans-Semibold.ttf" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <MauiImage Remove="Resources\Images\dotnet_bot.svg" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <AndroidResource Include="Resources\Fonts\OpenSans-Regular.ttf" />
+	  <AndroidResource Include="Resources\Fonts\OpenSans-Semibold.ttf" />
+	</ItemGroup>
 
 	<ItemGroup>
     	<PackageReference Include="CommunityToolkit.Maui.Markup" />

diff --git a/Scripts/buildpack.bat b/Scripts/buildpack.bat
@@ -38,7 +38,7 @@ dotnet pack /p:RestorePackages=true /p:Configuration=Release /p:Version=%Version
 
 dotnet pack /p:RestorePackages=true /p:Configuration=Release /p:Version=%Version% Mapsui.UI.Maui/Mapsui.UI.Maui.csproj --output Artifacts
 
-msbuild /p:RestorePackages=true /p:Configuration=Release /p:Version=%Version% Mapsui.UI.Uno/Mapsui.UI.Uno.csproj /t:Pack /p:PackageOutputPath="..\Artifacts"
+dotnet pack /p:RestorePackages=true /p:Configuration=Release /p:Version=%Version% Mapsui.UI.Uno/Mapsui.UI.Uno.csproj --output Artifacts
 
 dotnet pack /p:RestorePackages=true /p:Configuration=Release /p:Version=%Version% Mapsui.UI.Uno.WinUI/Mapsui.UI.Uno.WinUI.csproj --output Artifacts