Skip to content

Commit

Permalink
Update to SDK version 15.9.5
Browse files Browse the repository at this point in the history
  • Loading branch information
roman-miniailov committed Apr 16, 2024
1 parent de5bc3a commit 3a10bf6
Show file tree
Hide file tree
Showing 10 changed files with 175 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<ActiveDebugFramework>net7.0-android</ActiveDebugFramework>
<SelectedDevice>Android Emulator</SelectedDevice>
<SelectedPlatformGroup>Emulator</SelectedPlatformGroup>
<ActiveDebugProfile>Pixel 5 - API 33 (Android 13.0 - API 33)</ActiveDebugProfile>
<ActiveDebugProfile>Windows Subsystem for Android (Android 13.0 - API 33)</ActiveDebugProfile>
<IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen>
<DefaultDevice>pixel_5_-_api_33</DefaultDevice>
<DefaultDevice>Windows Subsystem for Android</DefaultDevice>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-android|AnyCPU'">
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<EmbeddedResource Include="Default.vfskin" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.7" />
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.8" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaPlayer" Version="15.9.5" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<EmbeddedResource Include="Default.vfskin" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.7" />
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.8" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaPlayer" Version="15.9.5" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('osx'))">$(TargetFrameworks);net7.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net7.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-android;net7.0-windows10.0.19041.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>QRReader</RootNamespace>
<UseMaui>true</UseMaui>
Expand All @@ -28,10 +27,10 @@
<PublishTrimmed Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">false</PublishTrimmed>
<PublishTrimmed Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">false</PublishTrimmed>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('osx')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64' AND $(TargetFramework.Contains('-maccatalyst'))">
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('osx')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64'">
<RuntimeIdentifier>maccatalyst-x64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('osx')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm64' AND $(TargetFramework.Contains('-maccatalyst'))">
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('osx')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm64'">
<RuntimeIdentifier>maccatalyst-arm64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0-android|AnyCPU'">
Expand Down Expand Up @@ -76,10 +75,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.7" />
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.8" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.5" />
<PackageReference Include="VisioForge.DotNet.MediaPlayer" Version="15.9.5" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.9.5" />
</ItemGroup>
<ProjectExtensions>
Expand Down
89 changes: 89 additions & 0 deletions Video Capture SDK X (crossplatform)/MAUI/QRReader/QRReader8.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-android;net8.0-windows10.0.19041.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>QRReader</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<!-- Display name -->
<ApplicationTitle>QRReader</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.qrreader</ApplicationId>
<ApplicationIdGuid>4b1c3a6e-72cb-46d2-84e5-dd4b3bbaa761</ApplicationIdGuid>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">23.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
<PublishReadyToRun>false</PublishReadyToRun>
<PublishTrimmed Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">true</PublishTrimmed>
<PublishTrimmed Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">true</PublishTrimmed>
<PublishTrimmed Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">false</PublishTrimmed>
<PublishTrimmed Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">false</PublishTrimmed>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('osx')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64'">
<RuntimeIdentifier>maccatalyst-x64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('osx')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm64'">
<RuntimeIdentifier>maccatalyst-arm64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0-android|AnyCPU'">
<RunAOTCompilation>False</RunAOTCompilation>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-maccatalyst|AnyCPU'">
<CreatePackage>false</CreatePackage>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.9.0" />
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64" Version="15.9.0" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="1.22.5.10" />
<ProjectReference Include="..\..\..\AndroidDependency\VisioForge.Core.Android.X8.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
<!-- Required - WinUI does not yet have buildTransitive for everything -->
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.2.0" />
</ItemGroup>
<ItemGroup>
<None Remove="Resources\Splash\splash.svg" />
</ItemGroup>
<ItemGroup>
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
</ItemGroup>
<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
<!-- 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>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.8" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaPlayer" Version="15.9.5" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.9.5" />
</ItemGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties XamarinHotReloadDebuggerTimeoutExceptionQRReaderHideInfoBar="True" />
</VisualStudio>
</ProjectExtensions>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen>
<ActiveDebugFramework>net8.0-windows10.0.19041.0</ActiveDebugFramework>
<ActiveDebugProfile>Windows Machine</ActiveDebugProfile>
<SelectedPlatformGroup>Emulator</SelectedPlatformGroup>
<DefaultDevice>pixel_5_-_api_33</DefaultDevice>
<SelectedDevice>Xiaomi 2201117TY</SelectedDevice>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android|AnyCPU'">
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
<EnvironmentVariables>
<Variable name="DYLD_PRINT_LIBRARIES" value="0" xmlns="" />
<Variable name="DYLD_LIBRARY_PATH" value="/usr/local/lib/:/usr/local/lib/gio/modules/:/opt/homebrew/lib/:/opt/homebrew/lib/gio/modules/:$DYLD_LIBRARY_PATH" xmlns="" />
</EnvironmentVariables>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-maccatalyst|AnyCPU'">
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
</PropertyGroup>
<ItemGroup>
<MauiXaml Update="Platforms\Windows\App.xaml">
<SubType>Designer</SubType>
</MauiXaml>
</ItemGroup>
<ItemGroup>
<None Update="Platforms\Windows\Package.appxmanifest">
<SubType>Designer</SubType>
</None>
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.5" />
<PackageReference Include="VisioForge.DotNet.MediaPlayer" Version="15.9.5" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.9.5" />
</ItemGroup>
<ProjectExtensions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,11 @@
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
<!-- Required - WinUI does not yet have buildTransitive for everything -->
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.230822000" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.5.1" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.2.0" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.iOS" Version="1.23.0" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Apple" Version="15.9.5" />
</ItemGroup>
<ItemGroup>
<None Remove="Resources\Splash\splash.svg" />
Expand All @@ -83,7 +82,7 @@
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="1.22.5.10" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.5" />
<PackageReference Include="VisioForge.DotNet.MediaPlayer" Version="15.9.5" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.9.5" />
</ItemGroup>
<ProjectExtensions>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.1.31911.260
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QRReader8", "MAUI\QRReader\QRReader8.csproj", "{0CBFB56A-A453-4677-8D85-14BAC516F2AD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleCapture8", "MAUI\SimpleCapture\SimpleCapture8.csproj", "{1A9B8956-BFFC-4777-8916-2D559EE151D8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VisioForge.Core.Android.X8", "..\AndroidDependency\VisioForge.Core.Android.X8.csproj", "{FA322D0F-AB1E-429B-9267-C69A86C14FF1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0CBFB56A-A453-4677-8D85-14BAC516F2AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0CBFB56A-A453-4677-8D85-14BAC516F2AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0CBFB56A-A453-4677-8D85-14BAC516F2AD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{0CBFB56A-A453-4677-8D85-14BAC516F2AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0CBFB56A-A453-4677-8D85-14BAC516F2AD}.Release|Any CPU.Build.0 = Release|Any CPU
{0CBFB56A-A453-4677-8D85-14BAC516F2AD}.Release|Any CPU.Deploy.0 = Release|Any CPU
{1A9B8956-BFFC-4777-8916-2D559EE151D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A9B8956-BFFC-4777-8916-2D559EE151D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A9B8956-BFFC-4777-8916-2D559EE151D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A9B8956-BFFC-4777-8916-2D559EE151D8}.Release|Any CPU.Build.0 = Release|Any CPU
{FA322D0F-AB1E-429B-9267-C69A86C14FF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FA322D0F-AB1E-429B-9267-C69A86C14FF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FA322D0F-AB1E-429B-9267-C69A86C14FF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FA322D0F-AB1E-429B-9267-C69A86C14FF1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {23833106-1A40-4105-9674-C90843B23533}
EndGlobalSection
EndGlobal

0 comments on commit 3a10bf6

Please sign in to comment.