Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Bassman2/MediaDevices
Browse files Browse the repository at this point in the history 
# Conflicts:
#	MediaDevices/Internal/ComHelper.cs
#	MediaDevices/Interop/Compile.cmd
#	MediaDevices/Interop/Interop.PortableDeviceApiLib.any.res
#	MediaDevices/Interop/Interop.PortableDeviceApiLib.x64.il
#	MediaDevices/Interop/Interop.PortableDeviceTypesLib.any.res
#	MediaDevices/Interop/Interop.PortableDeviceTypesLib.x64.dll
#	MediaDevices/Interop/Interop.PortableDeviceTypesLib.x64.il
#	MediaDevices/InteropOriginal/Interop.PortableDeviceTypesLib.x64.dll
  • Loading branch information
@Bassman2
Bassman2 committed Jan 13, 2019
2 parents 4043073 + 4d43741 commit 6565d84
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 1 deletion.
2 changes: 1 addition & 1 deletion MediaDeviceApp/MediaDeviceApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>true</Prefer32Bit>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Explorer, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
46 changes: 46 additions & 0 deletions MediaDevices.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,78 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E5353CB2-1320-4E96-A15E-551BA0B51105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5353CB2-1320-4E96-A15E-551BA0B51105}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5353CB2-1320-4E96-A15E-551BA0B51105}.Debug|x64.ActiveCfg = Debug|x64
{E5353CB2-1320-4E96-A15E-551BA0B51105}.Debug|x64.Build.0 = Debug|x64
{E5353CB2-1320-4E96-A15E-551BA0B51105}.Debug|x86.ActiveCfg = Debug|x86
{E5353CB2-1320-4E96-A15E-551BA0B51105}.Debug|x86.Build.0 = Debug|x86
{E5353CB2-1320-4E96-A15E-551BA0B51105}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5353CB2-1320-4E96-A15E-551BA0B51105}.Release|Any CPU.Build.0 = Release|Any CPU
{E5353CB2-1320-4E96-A15E-551BA0B51105}.Release|x64.ActiveCfg = Release|x64
{E5353CB2-1320-4E96-A15E-551BA0B51105}.Release|x64.Build.0 = Release|x64
{E5353CB2-1320-4E96-A15E-551BA0B51105}.Release|x86.ActiveCfg = Release|x86
{E5353CB2-1320-4E96-A15E-551BA0B51105}.Release|x86.Build.0 = Release|x86
{15DBA1E6-2C21-40AC-BD19-67926C3442AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{15DBA1E6-2C21-40AC-BD19-67926C3442AC}.Debug|x64.ActiveCfg = Debug|Any CPU
{15DBA1E6-2C21-40AC-BD19-67926C3442AC}.Debug|x86.ActiveCfg = Debug|Any CPU
{15DBA1E6-2C21-40AC-BD19-67926C3442AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{15DBA1E6-2C21-40AC-BD19-67926C3442AC}.Release|Any CPU.Build.0 = Release|Any CPU
{15DBA1E6-2C21-40AC-BD19-67926C3442AC}.Release|x64.ActiveCfg = Release|Any CPU
{15DBA1E6-2C21-40AC-BD19-67926C3442AC}.Release|x64.Build.0 = Release|Any CPU
{15DBA1E6-2C21-40AC-BD19-67926C3442AC}.Release|x86.ActiveCfg = Release|Any CPU
{15DBA1E6-2C21-40AC-BD19-67926C3442AC}.Release|x86.Build.0 = Release|Any CPU
{068A3C3C-99B6-4CDF-9DCA-DAAE229B8615}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{068A3C3C-99B6-4CDF-9DCA-DAAE229B8615}.Debug|Any CPU.Build.0 = Debug|Any CPU
{068A3C3C-99B6-4CDF-9DCA-DAAE229B8615}.Debug|x64.ActiveCfg = Debug|x64
{068A3C3C-99B6-4CDF-9DCA-DAAE229B8615}.Debug|x64.Build.0 = Debug|x64
{068A3C3C-99B6-4CDF-9DCA-DAAE229B8615}.Debug|x86.ActiveCfg = Debug|x86
{068A3C3C-99B6-4CDF-9DCA-DAAE229B8615}.Debug|x86.Build.0 = Debug|x86
{068A3C3C-99B6-4CDF-9DCA-DAAE229B8615}.Release|Any CPU.ActiveCfg = Release|Any CPU
{068A3C3C-99B6-4CDF-9DCA-DAAE229B8615}.Release|Any CPU.Build.0 = Release|Any CPU
{068A3C3C-99B6-4CDF-9DCA-DAAE229B8615}.Release|x64.ActiveCfg = Release|x64
{068A3C3C-99B6-4CDF-9DCA-DAAE229B8615}.Release|x64.Build.0 = Release|x64
{068A3C3C-99B6-4CDF-9DCA-DAAE229B8615}.Release|x86.ActiveCfg = Release|x86
{068A3C3C-99B6-4CDF-9DCA-DAAE229B8615}.Release|x86.Build.0 = Release|x86
{0D01E96E-036A-4DE7-BED5-4FAFB5D025B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0D01E96E-036A-4DE7-BED5-4FAFB5D025B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0D01E96E-036A-4DE7-BED5-4FAFB5D025B9}.Debug|x64.ActiveCfg = Debug|x64
{0D01E96E-036A-4DE7-BED5-4FAFB5D025B9}.Debug|x64.Build.0 = Debug|x64
{0D01E96E-036A-4DE7-BED5-4FAFB5D025B9}.Debug|x86.ActiveCfg = Debug|x86
{0D01E96E-036A-4DE7-BED5-4FAFB5D025B9}.Debug|x86.Build.0 = Debug|x86
{0D01E96E-036A-4DE7-BED5-4FAFB5D025B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0D01E96E-036A-4DE7-BED5-4FAFB5D025B9}.Release|Any CPU.Build.0 = Release|Any CPU
{0D01E96E-036A-4DE7-BED5-4FAFB5D025B9}.Release|x64.ActiveCfg = Release|x64
{0D01E96E-036A-4DE7-BED5-4FAFB5D025B9}.Release|x64.Build.0 = Release|x64
{0D01E96E-036A-4DE7-BED5-4FAFB5D025B9}.Release|x86.ActiveCfg = Release|x86
{0D01E96E-036A-4DE7-BED5-4FAFB5D025B9}.Release|x86.Build.0 = Release|x86
{6FD7A1DC-2396-4341-93D0-91A68290369A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6FD7A1DC-2396-4341-93D0-91A68290369A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6FD7A1DC-2396-4341-93D0-91A68290369A}.Debug|x64.ActiveCfg = Debug|Any CPU
{6FD7A1DC-2396-4341-93D0-91A68290369A}.Debug|x86.ActiveCfg = Debug|Any CPU
{6FD7A1DC-2396-4341-93D0-91A68290369A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6FD7A1DC-2396-4341-93D0-91A68290369A}.Release|Any CPU.Build.0 = Release|Any CPU
{6FD7A1DC-2396-4341-93D0-91A68290369A}.Release|x64.ActiveCfg = Release|Any CPU
{6FD7A1DC-2396-4341-93D0-91A68290369A}.Release|x86.ActiveCfg = Release|Any CPU
{03FB5D97-71E4-4304-B52F-6836605398B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{03FB5D97-71E4-4304-B52F-6836605398B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{03FB5D97-71E4-4304-B52F-6836605398B5}.Debug|x64.ActiveCfg = Debug|x64
{03FB5D97-71E4-4304-B52F-6836605398B5}.Debug|x64.Build.0 = Debug|x64
{03FB5D97-71E4-4304-B52F-6836605398B5}.Debug|x86.ActiveCfg = Debug|x86
{03FB5D97-71E4-4304-B52F-6836605398B5}.Debug|x86.Build.0 = Debug|x86
{03FB5D97-71E4-4304-B52F-6836605398B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{03FB5D97-71E4-4304-B52F-6836605398B5}.Release|Any CPU.Build.0 = Release|Any CPU
{03FB5D97-71E4-4304-B52F-6836605398B5}.Release|x64.ActiveCfg = Release|x64
{03FB5D97-71E4-4304-B52F-6836605398B5}.Release|x64.Build.0 = Release|x64
{03FB5D97-71E4-4304-B52F-6836605398B5}.Release|x86.ActiveCfg = Release|x86
{03FB5D97-71E4-4304-B52F-6836605398B5}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit 6565d84

Please sign in to comment.