diff --git a/CaptureTestApp.NuGet/CaptureTestApp.NuGet.csproj b/CaptureTestApp.NuGet/CaptureTestApp.NuGet.csproj index 20d0b73..bbfc979 100644 --- a/CaptureTestApp.NuGet/CaptureTestApp.NuGet.csproj +++ b/CaptureTestApp.NuGet/CaptureTestApp.NuGet.csproj @@ -7,6 +7,6 @@ x86;x64 - + \ No newline at end of file diff --git a/MediaCaptureWPF.Native/AssemblyInfo.cpp b/MediaCaptureWPF.Native/AssemblyInfo.cpp index 298f5c5..2b6086f 100644 --- a/MediaCaptureWPF.Native/AssemblyInfo.cpp +++ b/MediaCaptureWPF.Native/AssemblyInfo.cpp @@ -31,7 +31,7 @@ using namespace System::Security::Permissions; // You can specify all the value or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly:AssemblyVersionAttribute("2.0.0")]; +[assembly:AssemblyVersionAttribute("2.0.1")]; [assembly:ComVisible(false)]; diff --git a/Package/MMaitre.MediaCaptureWPF.nuspec b/Package/MMaitre.MediaCaptureWPF.nuspec index c4aecfd..ee07875 100644 --- a/Package/MMaitre.MediaCaptureWPF.nuspec +++ b/Package/MMaitre.MediaCaptureWPF.nuspec @@ -24,6 +24,10 @@ + + + + diff --git a/Package/MMaitre.MediaCaptureWPF.targets b/Package/MMaitre.MediaCaptureWPF.targets index 2675180..f40b168 100644 --- a/Package/MMaitre.MediaCaptureWPF.targets +++ b/Package/MMaitre.MediaCaptureWPF.targets @@ -1,10 +1,16 @@ - - $(MSBuildThisFileDirectory)\..\net10.0\$(PlatformTarget)\MediaCaptureWPF.dll + + $(MSBuildThisFileDirectory)\..\net10.0\$(Platform)\MediaCaptureWPF.dll - - $(MSBuildThisFileDirectory)\..\net10.0\$(PlatformTarget)\MediaCaptureWPF.Native.dll + + $(MSBuildThisFileDirectory)\..\net10.0\$(Platform)\MediaCaptureWPF.Native.dll + + + $(MSBuildThisFileDirectory)\..\net10.0\ref\MediaCaptureWPF.dll + + + $(MSBuildThisFileDirectory)\..\net10.0\ref\MediaCaptureWPF.Native.dll diff --git a/Package/clean.cmd b/Package/clean.cmd index 93ad7de..175cca8 100644 --- a/Package/clean.cmd +++ b/Package/clean.cmd @@ -4,15 +4,20 @@ setlocal REM Clean up if exist .\Win32 rmdir /S /Q .\Win32 if exist .\x64 rmdir /S /Q .\x64 +if exist .\Debug rmdir /S /Q .\Debug if exist .\Release rmdir /S /Q .\Release if exist ..\MediaCaptureWPF\bin rmdir /S /Q ..\MediaCaptureWPF\bin if exist ..\MediaCaptureWPF\obj rmdir /S /Q ..\MediaCaptureWPF\obj -if exist ..\Debug rmdir /S /Q ..\Debug +if exist ..\MediaCaptureWPF\ref rmdir /S /Q ..\MediaCaptureWPF\ref +if exist ..\Win32 rmdir /S /Q ..\Win32 if exist ..\x64 rmdir /S /Q ..\x64 +if exist ..\Debug rmdir /S /Q ..\Debug if exist ..\Release rmdir /S /Q ..\Release +if exist ..\MediaCaptureWPF.Native\Win32 rmdir /S /Q ..\MediaCaptureWPF.Native\Win32 +if exist ..\MediaCaptureWPF.Native\x64 rmdir /S /Q ..\MediaCaptureWPF.Native\x64 if exist ..\MediaCaptureWPF.Native\Debug rmdir /S /Q ..\MediaCaptureWPF.Native\Debug if exist ..\MediaCaptureWPF.Native\Release rmdir /S /Q ..\MediaCaptureWPF.Native\Release -if exist ..\MediaCaptureWPF.Native\x64 rmdir /S /Q ..\MediaCaptureWPF.Native\x64 +if exist ..\MediaSink\Win32 rmdir /S /Q ..\MediaSink\Win32 +if exist ..\MediaSink\x64 rmdir /S /Q ..\MediaSink\x64 if exist ..\MediaSink\Debug rmdir /S /Q ..\MediaSink\Debug if exist ..\MediaSink\Release rmdir /S /Q ..\MediaSink\Release -if exist ..\MediaSink\x64 rmdir /S /Q ..\MediaSink\x64 diff --git a/Package/pack.cmd b/Package/pack.cmd index 4d146c3..e14806b 100644 --- a/Package/pack.cmd +++ b/Package/pack.cmd @@ -1,7 +1,7 @@ @echo off setlocal enableextensions -set VERSION=2.0.0-beta +set VERSION=2.0.1-beta REM Clean call .\clean.cmd @@ -12,6 +12,12 @@ if %ERRORLEVEL% NEQ 0 goto eof msbuild -restore -v:m .\pack.sln /maxcpucount /target:build /nologo /p:Configuration=Release /p:Platform=x64 if %ERRORLEVEL% NEQ 0 goto eof +REM Build Ref +refasmer -v --all -n -O ..\MediaCaptureWPF\ref ..\MediaCaptureWPF\bin\x86\Release\net10.0-windows10.0.19041.0\MediaCaptureWPF.Native.dll +if %ERRORLEVEL% NEQ 0 goto eof +refasmer -v --all -n -O ..\MediaCaptureWPF\ref ..\MediaCaptureWPF\bin\x86\Release\net10.0-windows10.0.19041.0\MediaCaptureWPF.dll +if %ERRORLEVEL% NEQ 0 goto eof + REM Pack nuget.exe pack MMaitre.MediaCaptureWPF.nuspec -OutputDirectory Packages -Prop NuGetVersion=%VERSION% -NoPackageAnalysis if %ERRORLEVEL% NEQ 0 goto eof