Merge branch 'master' into qcontrolkit-conversion

This commit is contained in:
2023-11-26 14:06:24 -06:00
17 changed files with 17276 additions and 8944 deletions
+13 -6
View File
@@ -6,6 +6,13 @@
<RootNamespace>qController</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
<Compile Remove="MyPage.cs" />
<Compile Remove="Bespoke.Osc\Bespoke.Common.Osc\Properties\AssemblyInfo.cs" />
@@ -58,12 +65,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Acr.UserDialogs" Version="7.2.0.562" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2622" />
<PackageReference Include="Acr.Settings" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="QControlKit" Version="0.0.31" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="QControlKit" Version="0.0.33" />
</ItemGroup>
<ItemGroup>
<None Remove="App.xaml" />
@@ -76,7 +83,7 @@
<None Remove="Bespoke.Osc\Samples\VB\Receiver\My Project\Application.myapp" />
<None Remove="Bespoke.Net\.gitignore" />
<None Remove="Bespoke.Net\Help\Bespoke Common Library.chm" />
<None Remove="Xamarin.Forms" />
<None Remove="SuperSimpleTcp" />
</ItemGroup>
<!--<ItemGroup>
<EmbeddedResource Include="Pages\ControlPage.xaml">