Skip to content

Commit 4053394

Browse files
nbusseneaunbusseneau
authored
Merge pull request #1 from ScriptAndGo/feature/anycpu
Add AnyCPU compatibility
2 parents 6b42e0c + 3e26190 commit 4053394

8 files changed

Lines changed: 105 additions & 10 deletions

File tree

‎CaptureTestApp.NuGet/CaptureTestApp.NuGet.csproj‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,26 @@
5656
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5757
<Prefer32Bit>true</Prefer32Bit>
5858
</PropertyGroup>
59+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
60+
<DebugSymbols>true</DebugSymbols>
61+
<OutputPath>bin\Debug\</OutputPath>
62+
<DefineConstants>DEBUG;TRACE</DefineConstants>
63+
<DebugType>full</DebugType>
64+
<PlatformTarget>AnyCPU</PlatformTarget>
65+
<ErrorReport>prompt</ErrorReport>
66+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
67+
<Prefer32Bit>true</Prefer32Bit>
68+
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
70+
<OutputPath>bin\Release\</OutputPath>
71+
<DefineConstants>TRACE</DefineConstants>
72+
<Optimize>true</Optimize>
73+
<DebugType>pdbonly</DebugType>
74+
<PlatformTarget>AnyCPU</PlatformTarget>
75+
<ErrorReport>prompt</ErrorReport>
76+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
77+
<Prefer32Bit>true</Prefer32Bit>
78+
</PropertyGroup>
5979
<ItemGroup>
6080
<Reference Include="System" />
6181
<Reference Include="System.Data" />

‎CaptureTestApp/CaptureTestApp.csproj‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,26 @@
5656
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5757
<Prefer32Bit>true</Prefer32Bit>
5858
</PropertyGroup>
59+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
60+
<DebugSymbols>true</DebugSymbols>
61+
<OutputPath>bin\Debug\</OutputPath>
62+
<DefineConstants>DEBUG;TRACE</DefineConstants>
63+
<DebugType>full</DebugType>
64+
<PlatformTarget>AnyCPU</PlatformTarget>
65+
<ErrorReport>prompt</ErrorReport>
66+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
67+
<Prefer32Bit>true</Prefer32Bit>
68+
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
70+
<OutputPath>bin\Release\</OutputPath>
71+
<DefineConstants>TRACE</DefineConstants>
72+
<Optimize>true</Optimize>
73+
<DebugType>pdbonly</DebugType>
74+
<PlatformTarget>AnyCPU</PlatformTarget>
75+
<ErrorReport>prompt</ErrorReport>
76+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
77+
<Prefer32Bit>true</Prefer32Bit>
78+
</PropertyGroup>
5979
<ItemGroup>
6080
<Reference Include="System" />
6181
<Reference Include="System.Data" />

‎MediaCaptureWPF.sln‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.31101.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27428.2005
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaCaptureWPF.Native", "MediaCaptureWPF.Native\MediaCaptureWPF.Native.vcxproj", "{21717C88-442C-47EB-94D5-0405CB3CDD9F}"
77
EndProject
@@ -19,60 +19,88 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaptureTestApp.NuGet", "Cap
1919
EndProject
2020
Global
2121
GlobalSection(SolutionConfigurationPlatforms) = preSolution
22+
Debug|Any CPU = Debug|Any CPU
2223
Debug|x64 = Debug|x64
2324
Debug|x86 = Debug|x86
25+
Release|Any CPU = Release|Any CPU
2426
Release|x64 = Release|x64
2527
Release|x86 = Release|x86
2628
EndGlobalSection
2729
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30+
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|Any CPU.ActiveCfg = Debug|Win32
31+
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|Any CPU.Build.0 = Debug|Win32
2832
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|x64.ActiveCfg = Debug|x64
2933
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|x64.Build.0 = Debug|x64
3034
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|x86.ActiveCfg = Debug|Win32
3135
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|x86.Build.0 = Debug|Win32
36+
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|Any CPU.ActiveCfg = Release|Win32
37+
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|Any CPU.Build.0 = Release|Win32
3238
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x64.ActiveCfg = Release|x64
3339
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x64.Build.0 = Release|x64
3440
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x86.ActiveCfg = Release|Win32
3541
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x86.Build.0 = Release|Win32
42+
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|Any CPU.Build.0 = Debug|Any CPU
3644
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|x64.ActiveCfg = Debug|x64
3745
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|x64.Build.0 = Debug|x64
3846
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|x86.ActiveCfg = Debug|x86
3947
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|x86.Build.0 = Debug|x86
48+
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|Any CPU.Build.0 = Release|Any CPU
4050
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|x64.ActiveCfg = Release|x64
4151
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|x64.Build.0 = Release|x64
4252
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|x86.ActiveCfg = Release|x86
4353
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|x86.Build.0 = Release|x86
54+
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|Any CPU.ActiveCfg = Debug|Win32
55+
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|Any CPU.Build.0 = Debug|Win32
4456
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|x64.ActiveCfg = Debug|x64
4557
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|x64.Build.0 = Debug|x64
4658
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|x86.ActiveCfg = Debug|Win32
4759
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|x86.Build.0 = Debug|Win32
60+
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|Any CPU.ActiveCfg = Release|Win32
61+
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|Any CPU.Build.0 = Release|Win32
4862
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x64.ActiveCfg = Release|x64
4963
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x64.Build.0 = Release|x64
5064
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x86.ActiveCfg = Release|Win32
5165
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x86.Build.0 = Release|Win32
66+
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67+
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
5268
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|x64.ActiveCfg = Debug|x64
5369
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|x64.Build.0 = Debug|x64
5470
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|x86.ActiveCfg = Debug|x86
5571
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|x86.Build.0 = Debug|x86
72+
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
73+
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|Any CPU.Build.0 = Release|Any CPU
5674
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x64.ActiveCfg = Release|x64
5775
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x64.Build.0 = Release|x64
5876
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x86.ActiveCfg = Release|x86
5977
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x86.Build.0 = Release|x86
78+
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|Any CPU.ActiveCfg = Debug|Win32
79+
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|Any CPU.Build.0 = Debug|Win32
6080
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|x64.ActiveCfg = Debug|x64
6181
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|x64.Build.0 = Debug|x64
6282
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|x86.ActiveCfg = Debug|Win32
6383
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|x86.Build.0 = Debug|Win32
84+
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|Any CPU.ActiveCfg = Release|Win32
85+
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|Any CPU.Build.0 = Release|Win32
6486
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|x64.ActiveCfg = Release|x64
6587
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|x64.Build.0 = Release|x64
6688
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|x86.ActiveCfg = Release|Win32
6789
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|x86.Build.0 = Release|Win32
90+
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Debug|Any CPU.ActiveCfg = Debug|Win32
6891
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Debug|x64.ActiveCfg = Debug|Win32
6992
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Debug|x86.ActiveCfg = Debug|Win32
93+
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Release|Any CPU.ActiveCfg = Release|Win32
7094
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Release|x64.ActiveCfg = Release|Win32
7195
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Release|x86.ActiveCfg = Release|Win32
96+
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
97+
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|Any CPU.Build.0 = Debug|Any CPU
7298
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|x64.ActiveCfg = Debug|x64
7399
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|x64.Build.0 = Debug|x64
74100
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|x86.ActiveCfg = Debug|x64
75101
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|x86.Build.0 = Debug|x64
102+
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|Any CPU.ActiveCfg = Release|Any CPU
103+
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|Any CPU.Build.0 = Release|Any CPU
76104
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|x64.ActiveCfg = Release|x64
77105
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|x64.Build.0 = Release|x64
78106
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|x86.ActiveCfg = Release|x86
@@ -81,4 +109,7 @@ Global
81109
GlobalSection(SolutionProperties) = preSolution
82110
HideSolutionNode = FALSE
83111
EndGlobalSection
112+
GlobalSection(ExtensibilityGlobals) = postSolution
113+
SolutionGuid = {9F8B8174-D799-4C72-A03C-2E15503404C9}
114+
EndGlobalSection
84115
EndGlobal

‎MediaCaptureWPF/MediaCaptureWPF.csproj‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,24 @@
4949
<ErrorReport>prompt</ErrorReport>
5050
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5151
</PropertyGroup>
52+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
53+
<DebugSymbols>true</DebugSymbols>
54+
<OutputPath>bin\Debug\</OutputPath>
55+
<DefineConstants>DEBUG;TRACE</DefineConstants>
56+
<DebugType>full</DebugType>
57+
<PlatformTarget>AnyCPU</PlatformTarget>
58+
<ErrorReport>prompt</ErrorReport>
59+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
60+
</PropertyGroup>
61+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
62+
<OutputPath>bin\Release\</OutputPath>
63+
<DefineConstants>TRACE</DefineConstants>
64+
<Optimize>true</Optimize>
65+
<DebugType>pdbonly</DebugType>
66+
<PlatformTarget>AnyCPU</PlatformTarget>
67+
<ErrorReport>prompt</ErrorReport>
68+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
69+
</PropertyGroup>
5270
<ItemGroup>
5371
<Reference Include="PresentationCore" />
5472
<Reference Include="System" />

‎Package/MMaitre.MediaCaptureWPF.nuspec‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<files>
1818

1919
<!-- implementation -->
20+
<file src="..\MediaCaptureWPF\bin\Release\MediaCaptureWPF.dll" target="build\net451\AnyCPU\" />
21+
<file src="..\MediaCaptureWPF\bin\Release\MediaCaptureWPF.Native.dll" target="build\net451\AnyCPU\" />
2022
<file src="..\MediaCaptureWPF\bin\x86\Release\MediaCaptureWPF.dll" target="build\net451\x86\" />
2123
<file src="..\MediaCaptureWPF\bin\x86\Release\MediaCaptureWPF.Native.dll" target="build\net451\x86\" />
2224
<file src="..\MediaCaptureWPF\bin\x64\Release\MediaCaptureWPF.dll" target="build\net451\x64\" />

‎Package/MMaitre.MediaCaptureWPF.targets‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Target Name="CheckAnyCPU" Condition="('$(PlatformTarget)' != 'x86') AND ('$(PlatformTarget)' != 'x64')" BeforeTargets="PrepareForBuild">
3-
<Error Text="The $(Platform) target platform is not supported." />
4-
</Target>
52
<ItemGroup>
63
<Reference Include="MMaitre.MediaCaptureWPF">
74
<HintPath>$(MSBuildThisFileDirectory)\..\net451\$(PlatformTarget)\MediaCaptureWPF.dll</HintPath>

‎Package/Pack.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,27 @@ Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1414
Release|x64 = Release|x64
1515
Release|x86 = Release|x86
16+
Release|Any CPU = Release|Any CPU
1617
EndGlobalSection
1718
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1819
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x64.ActiveCfg = Release|x64
1920
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x64.Build.0 = Release|x64
2021
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x86.ActiveCfg = Release|Win32
2122
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x86.Build.0 = Release|Win32
23+
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|Any CPU.ActiveCfg = Release|Win32
24+
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|Any CPU.Build.0 = Release|Win32
2225
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x64.ActiveCfg = Release|x64
2326
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x64.Build.0 = Release|x64
2427
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x86.ActiveCfg = Release|Win32
2528
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x86.Build.0 = Release|Win32
29+
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|Any CPU.ActiveCfg = Release|Win32
30+
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|Any CPU.Build.0 = Release|Win32
2631
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x64.ActiveCfg = Release|x64
2732
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x64.Build.0 = Release|x64
2833
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x86.ActiveCfg = Release|x86
2934
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x86.Build.0 = Release|x86
35+
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|Any CPU.Build.0 = Release|Any CPU
3037
EndGlobalSection
3138
GlobalSection(SolutionProperties) = preSolution
3239
HideSolutionNode = FALSE

‎Package/pack.cmd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
@echo off
22
setlocal enableextensions
33

4-
set VERSION=1.0.0
5-
6-
set OUTPUT=c:\NuGet\
4+
set VERSION=1.1.0
75

86
if exist "%ProgramFiles%\MSBuild\12.0\Bin\msbuild.exe" (
97
set BUILD="%ProgramFiles%\MSBuild\12.0\Bin\msbuild.exe"
@@ -27,11 +25,13 @@ REM Build
2725
if %ERRORLEVEL% NEQ 0 goto eof
2826
%BUILD% .\pack.sln /maxcpucount /target:build /nologo /p:Configuration=Release /p:Platform=x64
2927
if %ERRORLEVEL% NEQ 0 goto eof
28+
%BUILD% .\pack.sln /maxcpucount /target:build /nologo /p:Configuration=Release /p:Platform="Any CPU"
29+
if %ERRORLEVEL% NEQ 0 goto eof
3030

3131
REM Pack
32-
%OUTPUT%nuget.exe pack MMaitre.MediaCaptureWPF.nuspec -OutputDirectory %OUTPUT%Packages -Prop NuGetVersion=%VERSION% -NoPackageAnalysis
32+
nuget.exe pack MMaitre.MediaCaptureWPF.nuspec -OutputDirectory Packages -Prop NuGetVersion=%VERSION% -NoPackageAnalysis
3333
if %ERRORLEVEL% NEQ 0 goto eof
34-
%OUTPUT%nuget.exe pack MMaitre.MediaCaptureWPF.Symbols.nuspec -OutputDirectory %OUTPUT%Symbols -Prop NuGetVersion=%VERSION% -NoPackageAnalysis
34+
nuget.exe pack MMaitre.MediaCaptureWPF.Symbols.nuspec -OutputDirectory Symbols -Prop NuGetVersion=%VERSION% -NoPackageAnalysis
3535
if %ERRORLEVEL% NEQ 0 goto eof
3636

3737
REM Tag

0 commit comments

Comments
 (0)