remove android from shared binary build process

rullinoiz · Sep 20, 2024 · bd52a72 · bd52a72
1 parent 88a0431
commit bd52a72
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,6 @@ bin/
 obj/
 /packages/
 riderModule.iml
-/_ReSharper.Caches/
+/_ReSharper.Caches/
+.DS_Store
+scoreboard2.sln.DotSettings.user
diff --git a/scoreboard2.Replicator/scoreboard2.Replicator.csproj b/scoreboard2.Replicator/scoreboard2.Replicator.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net8.0</TargetFramework>

diff --git a/scoreboard2.sln b/scoreboard2.sln
@@ -8,8 +8,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "scoreboard2.Browser", "scor
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "scoreboard2.Replicator", "scoreboard2.Replicator\scoreboard2.Replicator.csproj", "{37946694-844F-4350-BC76-41DB7B55BFD3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "scoreboard2.Android", "scoreboard2\scoreboard2.Android\scoreboard2.Android.csproj", "{581036AF-DA36-4C71-84A6-6F713DE50C3B}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -36,5 +34,9 @@ Global
 		{581036AF-DA36-4C71-84A6-6F713DE50C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{581036AF-DA36-4C71-84A6-6F713DE50C3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{581036AF-DA36-4C71-84A6-6F713DE50C3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B296F027-496F-46B4-AC15-9B60B83AF133}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B296F027-496F-46B4-AC15-9B60B83AF133}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B296F027-496F-46B4-AC15-9B60B83AF133}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B296F027-496F-46B4-AC15-9B60B83AF133}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/scoreboard2/scoreboard2.Android/scoreboard2.Android.csproj b/scoreboard2/scoreboard2.Android/scoreboard2.Android.csproj
@@ -28,6 +28,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\scoreboard2\scoreboard2.csproj"/>
+        <ProjectReference Include="..\scoreboard2\scoreboard2.csproj" 
+                          ReferenceOutputAssembly="true" 
+                          SetTargetFramework="TargetFramework=net8.0-android"/>
     </ItemGroup>
 </Project>
diff --git a/scoreboard2/scoreboard2.Browser/scoreboard2.Browser.csproj b/scoreboard2/scoreboard2.Browser/scoreboard2.Browser.csproj
@@ -4,6 +4,8 @@
         <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
         <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
         <OutputType>Exe</OutputType>
+        <DeleteExistingFiles>true</DeleteExistingFiles>
+
     </PropertyGroup>
 
     <ItemGroup>
@@ -15,6 +17,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\scoreboard2\scoreboard2.csproj" />
+        <ProjectReference Include="..\scoreboard2\scoreboard2.csproj"
+                          ReferenceOutputAssembly="true"
+                          SetTargetFramework="TargetFramework=net8.0-browser" />
     </ItemGroup>
 </Project>
diff --git a/scoreboard2/scoreboard2.Desktop/scoreboard2.Desktop.csproj b/scoreboard2/scoreboard2.Desktop/scoreboard2.Desktop.csproj
@@ -19,6 +19,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\scoreboard2\scoreboard2.csproj"/>
+        <ProjectReference Include="..\scoreboard2\scoreboard2.csproj" 
+                          ReferenceOutputAssembly="true"
+                          SetTargetFramework="TargetFramework=net8.0"/>
     </ItemGroup>
 </Project>
diff --git a/scoreboard2/scoreboard2/scoreboard2.csproj b/scoreboard2/scoreboard2/scoreboard2.csproj
@@ -17,10 +17,10 @@
         <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.1.3" />
         <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
         <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.3" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.3" />
+<!--        <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.3" />-->
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="SIPSorcery.WebSocketSharp" Version="0.0.1" />
     </ItemGroup>