Project cleanups

shinyorg · May 21, 2024 · 8e4f9d8 · 8e4f9d8
1 parent f5be7bc
commit 8e4f9d8
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 138 deletions.
diff --git a/Shiny.sln b/Shiny.sln
@@ -107,34 +107,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shiny.SourceGenerators", "s
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
-		Ad-Hoc|ARM = Ad-Hoc|ARM
-		Ad-Hoc|ARM64 = Ad-Hoc|ARM64
-		Ad-Hoc|iPhone = Ad-Hoc|iPhone
-		Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
-		Ad-Hoc|x64 = Ad-Hoc|x64
-		Ad-Hoc|x86 = Ad-Hoc|x86
-		AppStore|Any CPU = AppStore|Any CPU
-		AppStore|ARM = AppStore|ARM
-		AppStore|ARM64 = AppStore|ARM64
-		AppStore|iPhone = AppStore|iPhone
-		AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
-		AppStore|x64 = AppStore|x64
-		AppStore|x86 = AppStore|x86
 		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|ARM64 = Debug|ARM64
-		Debug|iPhone = Debug|iPhone
-		Debug|iPhoneSimulator = Debug|iPhoneSimulator
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|ARM64 = Release|ARM64
-		Release|iPhone = Release|iPhone
-		Release|iPhoneSimulator = Release|iPhoneSimulator
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{5CBF580C-B30C-4279-8E77-80D23AB2EF93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -232,118 +206,14 @@ Global
 		{C21631E7-A789-4DF8-B83F-03D6A07B57B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C21631E7-A789-4DF8-B83F-03D6A07B57B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C21631E7-A789-4DF8-B83F-03D6A07B57B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.AppStore|ARM64.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.AppStore|x64.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.AppStore|x86.Build.0 = Debug|Any CPU
 		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Debug|x64.Build.0 = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Debug|x86.Build.0 = Debug|Any CPU
 		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Release|ARM.Build.0 = Release|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Release|ARM64.Build.0 = Release|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Release|iPhone.Build.0 = Release|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Release|x64.ActiveCfg = Release|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Release|x64.Build.0 = Release|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Release|x86.ActiveCfg = Release|Any CPU
-		{4B31F220-D152-40A7-8D0F-2FABA7C3926C}.Release|x86.Build.0 = Release|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.AppStore|ARM64.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.AppStore|x64.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.AppStore|x86.Build.0 = Debug|Any CPU
 		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Debug|x64.Build.0 = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Debug|x86.Build.0 = Debug|Any CPU
 		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Release|ARM.Build.0 = Release|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Release|ARM64.Build.0 = Release|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Release|iPhone.Build.0 = Release|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Release|x64.ActiveCfg = Release|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Release|x64.Build.0 = Release|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Release|x86.ActiveCfg = Release|Any CPU
-		{A44BB6F8-283F-4FD7-9955-41B6B515AC98}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/samples/Directory.build.props b/samples/Directory.build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <MauiVersion>8.0.10</MauiVersion>
+        <MauiVersion>8.0.40</MauiVersion>
         <MicrosoftExtensionsVersion>8.0.0</MicrosoftExtensionsVersion>
     </PropertyGroup>
 </Project>
diff --git a/samples/Sample.Maui/Sample.Maui.csproj b/samples/Sample.Maui/Sample.Maui.csproj
@@ -50,7 +50,7 @@
         <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
         <PackageReference Include="Prism.DryIoc.Maui" Version="9.0.401-pre" />
         <PackageReference Include="Humanizer" Version="2.14.1" />
-        <PackageReference Include="sqlite-net-pcl" Version="1.9.141-beta" />
+        <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
         <PackageReference Include="CommunityToolkit.Maui.Markup" Version="4.0.0" />
     </ItemGroup>
 

diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -20,7 +20,7 @@
         <CI Condition="'$(GITHUB_ACTIONS)' == 'true'">true</CI>
         <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
         <MicrosoftExtensionsVersion>8.0.0</MicrosoftExtensionsVersion>
-        <MauiVersion>8.0.3</MauiVersion>
+        <MauiVersion>8.0.40</MauiVersion>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/src/Shiny.Core/Shiny.Core.csproj b/src/Shiny.Core/Shiny.Core.csproj
@@ -1,14 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
     <PropertyGroup>
         <TargetFrameworks>$(DefaultTargetFrameworks);$(WindowsTarget)</TargetFrameworks>
         <Description>The Shiny Core Foundation where all Shiny modules are built on</Description>
         <RootNamespace>Shiny</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="Shiny.Core.targets" Pack="True" PackagePath="buildTransitive" />
+<!--        <None Include="Shiny.Core.targets" Pack="True" PackagePath="buildTransitive" />-->
         <PackageReference Include="System.Reactive" Version="6.0.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsVersion)" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsVersion)" />
@@ -23,6 +21,4 @@
         <PackageReference Include="Xamarin.AndroidX.Lifecycle.Process" Version="2.6.2.1" />
         <PackageReference Include="Xamarin.AndroidX.Lifecycle.Common" Version="2.6.2.1" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>