Skip to content

Commit

Permalink
Update to SDK version 15.8.43
Browse files Browse the repository at this point in the history
  • Loading branch information
roman-miniailov committed Mar 19, 2024
1 parent f656e8e commit ed3e8b6
Show file tree
Hide file tree
Showing 16 changed files with 213 additions and 55 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
One for Windows with net7.0-windows TFM, one for MacOS with net7.0-macos and one with net7.0 TFM for Linux.-->
<Nullable>disable</Nullable>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<ApplicationManifest>app.manifest</ApplicationManifest>
<!-- <ApplicationId>com.visioforge.simplevideocaptureax</ApplicationId>-->

<TargetFramework>net7.0</TargetFramework>
<OutputType>WinExe</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<CreatePackage>false</CreatePackage>
<UseSGen>false</UseSGen>
<WarningLevel>4</WarningLevel>
<LinkMode>None</LinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<CreatePackage>false</CreatePackage>
<UseSGen>false</UseSGen>
<LinkMode>None</LinkMode>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<!-- <PackageReference Include="VisioForge.CrossPlatform.Core.macOS" Version="15.7.1" />-->
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SimpleVideoCaptureA\SimpleVideoCaptureA.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_LastSelectedProfileId>C:\Projects\_Projects\MediaFrameworkDotNet\_SETUP\FILES\Demos\Video Capture SDK X %28crossplatform%29\Avalonia\SimpleVideoCapture\SimpleVideoCaptureA.Linux\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
using System;

using Avalonia;
using Avalonia.ReactiveUI;

namespace SimpleVideoCaptureA.Desktop;

class Program
{
// Initialization code. Don't use any Avalonia, third-party APIs or any
// SynchronizationContext-reliant code before AppMain is called: things aren't initialized
// yet and stuff might break.
[STAThread]
public static void Main(string[] args) => BuildAvaloniaApp()
.StartWithClassicDesktopLifetime(args);

// Avalonia configuration, don't remove; also used by visual designer.
public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>()
.UsePlatformDetect()
.WithInterFont()
.LogToTrace()
.UseReactiveUI();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
One for Windows with net7.0-windows TFM, one for MacOS with net7.0-macos and one with net7.0 TFM for Linux.-->
<Nullable>disable</Nullable>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<ApplicationManifest>app.manifest</ApplicationManifest>
<!-- <ApplicationId>com.visioforge.simplevideocaptureax</ApplicationId>-->
<TargetFramework>net7.0-macos10.14</TargetFramework>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>osx-arm64</RuntimeIdentifiers>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<CreatePackage>false</CreatePackage>
<UseSGen>false</UseSGen>
<WarningLevel>4</WarningLevel>
<LinkMode>None</LinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<CreatePackage>false</CreatePackage>
<UseSGen>false</UseSGen>
<LinkMode>None</LinkMode>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SimpleVideoCaptureA\SimpleVideoCaptureA.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<!-- This manifest is used on Windows only.
Don't remove it as it might cause problems with window transparency and embeded controls.
For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
<assemblyIdentity version="1.0.0.0" name="AvaloniaTest.Desktop"/>

<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- A list of the Windows versions that this application has been tested on
and is designed to work with. Uncomment the appropriate elements
and Windows will automatically select the most compatible environment. -->

<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application>
</compatibility>
</assembly>
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
using System;

using Avalonia;
using Avalonia.ReactiveUI;

namespace SimpleVideoCaptureA.Desktop;

class Program
{
// Initialization code. Don't use any Avalonia, third-party APIs or any
// SynchronizationContext-reliant code before AppMain is called: things aren't initialized
// yet and stuff might break.
[STAThread]
public static void Main(string[] args) => BuildAvaloniaApp()
.StartWithClassicDesktopLifetime(args);

// Avalonia configuration, don't remove; also used by visual designer.
public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>()
.UsePlatformDetect()
.WithInterFont()
.LogToTrace()
.UseReactiveUI();
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,12 @@
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<ApplicationManifest>app.manifest</ApplicationManifest>
<!-- <ApplicationId>com.visioforge.simplevideocaptureax</ApplicationId>-->
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOsPlatform('MacOS'))">
<TargetFramework>net7.0-macos10.14</TargetFramework>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>osx-arm64</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">

<TargetFramework>net7.0-windows</TargetFramework>
<RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
<OutputType>WinExe</OutputType>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOsPlatform('Linux'))">
<TargetFramework>net7.0</TargetFramework>
<OutputType>WinExe</OutputType>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<CreatePackage>false</CreatePackage>
<UseSGen>false</UseSGen>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
<EnvironmentVariables>
<Variable name="DYLD_PRINT_LIBRARIES" value="0" xmlns="" />
<Variable name="DYLD_LIBRARY_PATH" value="/opt/homebrew/lib/:/opt/homebrew/lib/gio/modules/:$DYLD_LIBRARY_PATH" xmlns="" />
</EnvironmentVariables>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<!-- This manifest is used on Windows only.
Don't remove it as it might cause problems with window transparency and embeded controls.
For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
<assemblyIdentity version="1.0.0.0" name="AvaloniaTest.Desktop"/>

<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- A list of the Windows versions that this application has been tested on
and is designed to work with. Uncomment the appropriate elements
and Windows will automatically select the most compatible environment. -->

<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application>
</compatibility>
</assembly>
Original file line number Diff line number Diff line change
@@ -1,40 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Nullable>disable</Nullable>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOsPlatform('MacOS'))">
<TargetFramework>net7.0-macos10.14</TargetFramework>
<!-- <RuntimeIdentifiers>osx-arm64</RuntimeIdentifiers>-->
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
<TargetFramework>net7.0-windows</TargetFramework>
<RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOsPlatform('Linux'))">
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<CreatePackage>false</CreatePackage>
<UseSGen>false</UseSGen>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<CreatePackage>false</CreatePackage>
<UseSGen>false</UseSGen>
</PropertyGroup>
<ItemGroup>
<AvaloniaResource Include="Assets\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.8.43" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Avalonia" Version="15.8.43" />
</ItemGroup>
<PropertyGroup>
<Nullable>disable</Nullable>
<LangVersion>latest</LangVersion>

<TargetFrameworks>net7.0-windows;net7.0-macos10.14;net7.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<CreatePackage>false</CreatePackage>
<UseSGen>false</UseSGen>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<CreatePackage>false</CreatePackage>
<UseSGen>false</UseSGen>
</PropertyGroup>
<ItemGroup>
<AvaloniaResource Include="Assets\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.8.43" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Avalonia" Version="15.8.43" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleVideoCaptureA", "Aval
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SimpleVideoCapture", "SimpleVideoCapture", "{4D1DCE7A-6A34-4D2D-BFFC-471B1318D552}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleVideoCaptureA.Desktop", "Avalonia\SimpleVideoCapture\SimpleVideoCaptureA.Desktop\SimpleVideoCaptureA.Desktop.csproj", "{139BD63C-7BFF-4E89-AFD6-0B0697EAAF18}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleVideoCaptureA.Linux", "Avalonia\SimpleVideoCapture\SimpleVideoCaptureA.Linux\SimpleVideoCaptureA.Linux.csproj", "{18CD09CF-9DE3-4909-ADE6-F40A24E88670}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleVideoCaptureA.MacOS", "Avalonia\SimpleVideoCapture\SimpleVideoCaptureA.MacOS\SimpleVideoCaptureA.MacOS.csproj", "{AA329A66-106A-4B3C-9F36-2546DBB838FB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleVideoCaptureA.Windows", "Avalonia\SimpleVideoCapture\SimpleVideoCaptureA.Windows\SimpleVideoCaptureA.Windows.csproj", "{59BFF25F-CE53-49A2-88CC-311557E4CE60}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -19,17 +23,27 @@ Global
{28B6B493-BC5E-4ACE-86E0-4966C7522790}.Debug|Any CPU.Build.0 = Debug|Any CPU
{28B6B493-BC5E-4ACE-86E0-4966C7522790}.Release|Any CPU.ActiveCfg = Release|Any CPU
{28B6B493-BC5E-4ACE-86E0-4966C7522790}.Release|Any CPU.Build.0 = Release|Any CPU
{139BD63C-7BFF-4E89-AFD6-0B0697EAAF18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{139BD63C-7BFF-4E89-AFD6-0B0697EAAF18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{139BD63C-7BFF-4E89-AFD6-0B0697EAAF18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{139BD63C-7BFF-4E89-AFD6-0B0697EAAF18}.Release|Any CPU.Build.0 = Release|Any CPU
{18CD09CF-9DE3-4909-ADE6-F40A24E88670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{18CD09CF-9DE3-4909-ADE6-F40A24E88670}.Debug|Any CPU.Build.0 = Debug|Any CPU
{18CD09CF-9DE3-4909-ADE6-F40A24E88670}.Release|Any CPU.ActiveCfg = Release|Any CPU
{18CD09CF-9DE3-4909-ADE6-F40A24E88670}.Release|Any CPU.Build.0 = Release|Any CPU
{AA329A66-106A-4B3C-9F36-2546DBB838FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AA329A66-106A-4B3C-9F36-2546DBB838FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA329A66-106A-4B3C-9F36-2546DBB838FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AA329A66-106A-4B3C-9F36-2546DBB838FB}.Release|Any CPU.Build.0 = Release|Any CPU
{59BFF25F-CE53-49A2-88CC-311557E4CE60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{59BFF25F-CE53-49A2-88CC-311557E4CE60}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59BFF25F-CE53-49A2-88CC-311557E4CE60}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59BFF25F-CE53-49A2-88CC-311557E4CE60}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{28B6B493-BC5E-4ACE-86E0-4966C7522790} = {4D1DCE7A-6A34-4D2D-BFFC-471B1318D552}
{139BD63C-7BFF-4E89-AFD6-0B0697EAAF18} = {4D1DCE7A-6A34-4D2D-BFFC-471B1318D552}
{18CD09CF-9DE3-4909-ADE6-F40A24E88670} = {4D1DCE7A-6A34-4D2D-BFFC-471B1318D552}
{AA329A66-106A-4B3C-9F36-2546DBB838FB} = {4D1DCE7A-6A34-4D2D-BFFC-471B1318D552}
{59BFF25F-CE53-49A2-88CC-311557E4CE60} = {4D1DCE7A-6A34-4D2D-BFFC-471B1318D552}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4F46B964-BC4D-4675-AF4A-17347CF13390}
Expand Down

0 comments on commit ed3e8b6

Please sign in to comment.