Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Martin Finkel
LibVLCSharp
Commits
13279805
Commit
13279805
authored
Apr 13, 2018
by
Martin Finkel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
temporarily remove Cauldron.Interception.Fody. It causes problem at runtime with mono debugger
parent
1d309455
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
25 deletions
+23
-25
LibVLCSharp.Android.Sample/LibVLCSharp.Android.Sample.csproj
LibVLCSharp.Android.Sample/LibVLCSharp.Android.Sample.csproj
+12
-9
LibVLCSharp.Android.Sample/MainActivity.cs
LibVLCSharp.Android.Sample/MainActivity.cs
+3
-6
LibVLCSharp.Android.Sample/packages.config
LibVLCSharp.Android.Sample/packages.config
+1
-0
LibVLCSharp.Android/LibVLCSharp.Android.csproj
LibVLCSharp.Android/LibVLCSharp.Android.csproj
+1
-1
LibVLCSharp/LibVLC.cs
LibVLCSharp/LibVLC.cs
+6
-6
LibVLCSharp/LibVLCSharp.csproj
LibVLCSharp/LibVLCSharp.csproj
+0
-3
No files found.
LibVLCSharp.Android.Sample/LibVLCSharp.Android.Sample.csproj
View file @
13279805
...
...
@@ -17,12 +17,13 @@
<AndroidResgenClass>
Resource
</AndroidResgenClass>
<GenerateSerializationAssemblies>
Off
</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>
True
</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>
v
8.0
</TargetFrameworkVersion>
<TargetFrameworkVersion>
v
7.1
</TargetFrameworkVersion>
<AndroidManifest>
Properties\AndroidManifest.xml
</AndroidManifest>
<MonoAndroidResourcePrefix>
Resources
</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>
Assets
</MonoAndroidAssetsPrefix>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<AndroidSupportedAbis>
armeabi-v7a
</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "
>
<DebugSymbols>
True
</DebugSymbols>
...
...
@@ -32,13 +33,14 @@
<DefineConstants>
TRACE;DEBUG;__ANDROID__
</DefineConstants>
<ErrorReport>
prompt
</ErrorReport>
<WarningLevel>
4
</WarningLevel>
<AndroidUseSharedRuntime>
True
</AndroidUseSharedRuntime>
<AndroidLinkMode>
None
</AndroidLinkMode>
<EmbedAssembliesIntoApk>
False
</EmbedAssembliesIntoApk>
<AndroidUseSharedRuntime>
true
</AndroidUseSharedRuntime>
<AndroidLinkMode>
SdkOnly
</AndroidLinkMode>
<AndroidSupportedAbis>
</AndroidSupportedAbis>
<AotAssemblies>
false
</AotAssemblies>
<EnableLLVM>
false
</EnableLLVM>
<BundleAssemblies>
false
</BundleAssemblies>
<
AndroidSupportedAbis>
armeabi-v7a
</AndroidSupportedAbis
>
<
EmbedAssembliesIntoApk>
false
</EmbedAssembliesIntoApk
>
</PropertyGroup>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "
>
<DebugSymbols>
True
</DebugSymbols>
...
...
@@ -52,11 +54,11 @@
<AndroidUseSharedRuntime>
False
</AndroidUseSharedRuntime>
<AndroidLinkMode>
SdkOnly
</AndroidLinkMode>
<EmbedAssembliesIntoApk>
True
</EmbedAssembliesIntoApk>
<AotAssemblies>
false
</AotAssemblies>
<EnableLLVM>
false
</EnableLLVM>
<BundleAssemblies>
false
</BundleAssemblies>
</PropertyGroup>
<ItemGroup>
<Reference
Include=
"Cauldron.Interception, Version=2.0.0.29, Culture=neutral, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Cauldron.Interception.Fody.2.0.29\lib\netstandard2.0\Cauldron.Interception.dll
</HintPath>
</Reference>
<Reference
Include=
"LibVLCSharp.Android.AWindow, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
>
<SpecificVersion>
False
</SpecificVersion>
<HintPath>
..\LibVLCSharp.Android.AWindow\bin\Debug\LibVLCSharp.Android.AWindow.dll
</HintPath>
...
...
@@ -78,7 +80,6 @@
<None
Include=
"Resources\AboutResources.txt"
/>
<None
Include=
"Properties\AndroidManifest.xml"
/>
<None
Include=
"Assets\AboutAssets.txt"
/>
<AndroidNativeLibrary
Include=
"lib\armeabi-v7a\libvlc.so"
/>
</ItemGroup>
<ItemGroup>
<AndroidResource
Include=
"Resources\layout\Main.axml"
>
...
...
@@ -114,7 +115,9 @@
<ErrorText>
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
</ErrorText>
</PropertyGroup>
<Error
Condition=
"!Exists('..\packages\Fody.2.3.3\build\netstandard1.0\Fody.targets')"
Text=
"$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.3.3\build\netstandard1.0\Fody.targets'))"
/>
<Error
Condition=
"!Exists('..\packages\VideoLAN.LibVLC.Android.3.0.0-alpha\build\VideoLAN.LibVLC.Android.targets')"
Text=
"$([System.String]::Format('$(ErrorText)', '..\packages\VideoLAN.LibVLC.Android.3.0.0-alpha\build\VideoLAN.LibVLC.Android.targets'))"
/>
</Target>
<Import
Project=
"..\packages\VideoLAN.LibVLC.Android.3.0.0-alpha\build\VideoLAN.LibVLC.Android.targets"
Condition=
"Exists('..\packages\VideoLAN.LibVLC.Android.3.0.0-alpha\build\VideoLAN.LibVLC.Android.targets')"
/>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
...
...
LibVLCSharp.Android.Sample/MainActivity.cs
View file @
13279805
...
...
@@ -3,13 +3,10 @@ using System.Runtime.InteropServices;
using
System.Security
;
using
Android.App
;
using
Android.Graphics
;
using
Android.OS
;
using
Android.Runtime
;
using
Android.Views
;
using
Com.Example.Orgvideolanlibvlc
;
using
Java.Interop
;
using
Org.Videolan.Libvlc
;
using
VideoLAN.LibVLC
;
namespace
LibVLCSharp.Android.Sample
...
...
@@ -28,9 +25,9 @@ namespace LibVLCSharp.Android.Sample
// Set our view from the "main" layout resource
SetContentView
(
Resource
.
Layout
.
Main
);
}
protected
override
void
OnResume
()
{
base
.
OnResume
();
...
...
LibVLCSharp.Android.Sample/packages.config
View file @
13279805
...
...
@@ -2,4 +2,5 @@
<
packages
>
<
package
id
=
"Cauldron.Interception.Fody"
version
=
"2.0.29"
targetFramework
=
"monoandroid71"
/>
<
package
id
=
"Fody"
version
=
"2.3.3"
targetFramework
=
"monoandroid71"
developmentDependency
=
"true"
/>
<
package
id
=
"VideoLAN.LibVLC.Android"
version
=
"3.0.0-alpha"
targetFramework
=
"monoandroid71"
/>
</
packages
>
\ No newline at end of file
LibVLCSharp.Android/LibVLCSharp.Android.csproj
View file @
13279805
...
...
@@ -15,7 +15,7 @@
<AndroidResgenFile>
Resources\Resource.Designer.cs
</AndroidResgenFile>
<GenerateSerializationAssemblies>
Off
</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>
True
</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>
v
8.0
</TargetFrameworkVersion>
<TargetFrameworkVersion>
v
7.1
</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "
>
<DebugSymbols>
true
</DebugSymbols>
...
...
LibVLCSharp/LibVLC.cs
View file @
13279805
...
...
@@ -2,14 +2,14 @@
using
System.Reflection
;
using
System.Runtime.InteropServices
;
using
System.Security
;
using
Cauldron.Interception
;
//
using Cauldron.Interception;
namespace
VideoLAN.LibVLC
{
[
AttributeUsage
(
AttributeTargets
.
Method
|
AttributeTargets
.
Constructor
|
AttributeTargets
.
Property
,
AllowMultiple
=
true
,
Inherited
=
false
)]
public
class
LibVLC
:
Attribute
,
IMethodInterceptor
,
IPropertyGetterInterceptor
public
class
LibVLC
:
Attribute
//
, IMethodInterceptor, IPropertyGetterInterceptor
{
struct
Native
{
...
...
@@ -79,10 +79,10 @@ namespace VideoLAN.LibVLC
{
}
public
void
OnGet
(
PropertyInterceptionInfo
propertyInterceptionInfo
,
object
value
)
{
PerformCheck
();
}
//
public void OnGet(PropertyInterceptionInfo propertyInterceptionInfo, object value)
//
{
//
PerformCheck();
//
}
void
PerformCheck
()
{
...
...
LibVLCSharp/LibVLCSharp.csproj
View file @
13279805
...
...
@@ -4,7 +4,4 @@
<RootNamespace>VideoLAN.LibVLC</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Cauldron.Interception.Fody" Version="2.0.29" />
</ItemGroup>
</Project>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment