forked from zoom/zoom-c-sharp-wrapper
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Edits to Zoom SDK v5.0.24433.0616 to fix issues and enable to work on…
… Windows 10 Changes: + Created Gitignore based on https://github.com/github/gitignore/blob/master/VisualStudio.gitignore to remove build output + Support for VS 2019: Upgraded project files to use the latest version of the C++ VS runtime and fixed it so we can build with Visual Studio 2019 Community Edition. It looks like they used VS 2015 before. Also changed the Windows SDK targeting from 8.0 to 10 (latest, using 10.0.18362.0 on my build machine) and upgraded the platform toolset to v142. + Processor architecture mismatch, targeted MSIL, but requires x86. Updated configuration manager to build all projects (was not set to build the wrapper) and set the active solution platform to x86 + release. Release just to make sure performance is good (it worked with both) + Before needed to add CSHARP_WRAP as an additional compiler flag, but they fixed that in the last SDK update + Disable precompiled headers (NotUsing). Note that the VS C/C++ project UI doesn't show this properly, so examine the vcxproj file. This slows down the build immensely but was not able to get stdafx.h generating properly. This output will be checked in/not built often to mitigate this. Notes: Output is done through custom actions to zoom-c-sharp-wrapper\bin. The entire folder must be copied. It includes the sample app, but that's ok, as we won't run it. bin\zoom_sdk_dotnet_wrap.dll was committed in the original repo, it should not have been. The build modifies it. Just ignore this modification, we should try to minimize changes from the original version. SDK upgrade: Previously I was using v4.6.21666.0428. There was a major upgrade because of Zoom's "security" push during 2020, and they changed how SDK apps authenticate. However, the new JWT route does not work, but using the JWT meeting join route and the v4 way of an SDK user worked. This requires some changes in MeetingRecorder to change the join user type from SDK_UT_APIUSER to SDK_UT_WITHOUT_LOGIN and the join parameter class from JoinParam4APIUser to JoinParam4WithoutLogin. Future upgrades should keep an eye on this to make sure it doesn't break us. New SDK version is v5.0.24433.0616. Also ensure the reference in ZoomController to the wrap DLL is updated properly. Testing: + Took the output in bin/* and copied to working directory for meeting recorder. Ensured it could build and join a Zoom meeting successfully. Changes to app: + The release notes mention the SDK now supports JWT-based authentication. It neglects to mention that they removed support for joining as an SDK user. In zoom_sdk_c_sharp_wrap\meeting_service_dotnet_wrap.cpp, CMeetingServiceDotNetWrap::Join only supports joining as a normal user or with SDK_UT_WITHOUT_LOGIN. MeetingRecorder updates were needed. See https://github.com/zoom/zoom-sdk-windows/blob/master/CHANGELOG.md for the details on JWT join (again, not working) -- for future reference.
- Loading branch information
Showing
4 changed files
with
377 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,364 @@ | ||
| # Copied 2020.09.29, latest commit 6eff882467cbde7b4e293b4dd6abd7685fc67844 from URL below | ||
| ## --- Original Template --- | ||
| ## Ignore Visual Studio temporary files, build results, and | ||
| ## files generated by popular Visual Studio add-ons. | ||
| ## | ||
| ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore | ||
|
|
||
| # User-specific files | ||
| *.rsuser | ||
| *.suo | ||
| *.user | ||
| *.userosscache | ||
| *.sln.docstates | ||
|
|
||
| # User-specific files (MonoDevelop/Xamarin Studio) | ||
| *.userprefs | ||
|
|
||
| # Mono auto generated files | ||
| mono_crash.* | ||
|
|
||
| # Build results | ||
| [Dd]ebug/ | ||
| [Dd]ebugPublic/ | ||
| [Rr]elease/ | ||
| [Rr]eleases/ | ||
| x64/ | ||
| x86/ | ||
| [Ww][Ii][Nn]32/ | ||
| [Aa][Rr][Mm]/ | ||
| [Aa][Rr][Mm]64/ | ||
| bld/ | ||
| [Bb]in/ | ||
| [Oo]bj/ | ||
| [Ll]og/ | ||
| [Ll]ogs/ | ||
|
|
||
| # Visual Studio 2015/2017 cache/options directory | ||
| .vs/ | ||
| # Uncomment if you have tasks that create the project's static files in wwwroot | ||
| #wwwroot/ | ||
|
|
||
| # Visual Studio 2017 auto generated files | ||
| Generated\ Files/ | ||
|
|
||
| # MSTest test Results | ||
| [Tt]est[Rr]esult*/ | ||
| [Bb]uild[Ll]og.* | ||
|
|
||
| # NUnit | ||
| *.VisualState.xml | ||
| TestResult.xml | ||
| nunit-*.xml | ||
|
|
||
| # Build Results of an ATL Project | ||
| [Dd]ebugPS/ | ||
| [Rr]eleasePS/ | ||
| dlldata.c | ||
|
|
||
| # Benchmark Results | ||
| BenchmarkDotNet.Artifacts/ | ||
|
|
||
| # .NET Core | ||
| project.lock.json | ||
| project.fragment.lock.json | ||
| artifacts/ | ||
|
|
||
| # ASP.NET Scaffolding | ||
| ScaffoldingReadMe.txt | ||
|
|
||
| # StyleCop | ||
| StyleCopReport.xml | ||
|
|
||
| # Files built by Visual Studio | ||
| *_i.c | ||
| *_p.c | ||
| *_h.h | ||
| *.ilk | ||
| *.meta | ||
| *.obj | ||
| *.iobj | ||
| *.pch | ||
| *.pdb | ||
| *.ipdb | ||
| *.pgc | ||
| *.pgd | ||
| *.rsp | ||
| *.sbr | ||
| *.tlb | ||
| *.tli | ||
| *.tlh | ||
| *.tmp | ||
| *.tmp_proj | ||
| *_wpftmp.csproj | ||
| *.log | ||
| *.vspscc | ||
| *.vssscc | ||
| .builds | ||
| *.pidb | ||
| *.svclog | ||
| *.scc | ||
|
|
||
| # Chutzpah Test files | ||
| _Chutzpah* | ||
|
|
||
| # Visual C++ cache files | ||
| ipch/ | ||
| *.aps | ||
| *.ncb | ||
| *.opendb | ||
| *.opensdf | ||
| *.sdf | ||
| *.cachefile | ||
| *.VC.db | ||
| *.VC.VC.opendb | ||
|
|
||
| # Visual Studio profiler | ||
| *.psess | ||
| *.vsp | ||
| *.vspx | ||
| *.sap | ||
|
|
||
| # Visual Studio Trace Files | ||
| *.e2e | ||
|
|
||
| # TFS 2012 Local Workspace | ||
| $tf/ | ||
|
|
||
| # Guidance Automation Toolkit | ||
| *.gpState | ||
|
|
||
| # ReSharper is a .NET coding add-in | ||
| _ReSharper*/ | ||
| *.[Rr]e[Ss]harper | ||
| *.DotSettings.user | ||
|
|
||
| # TeamCity is a build add-in | ||
| _TeamCity* | ||
|
|
||
| # DotCover is a Code Coverage Tool | ||
| *.dotCover | ||
|
|
||
| # AxoCover is a Code Coverage Tool | ||
| .axoCover/* | ||
| !.axoCover/settings.json | ||
|
|
||
| # Coverlet is a free, cross platform Code Coverage Tool | ||
| coverage*.json | ||
| coverage*.xml | ||
| coverage*.info | ||
|
|
||
| # Visual Studio code coverage results | ||
| *.coverage | ||
| *.coveragexml | ||
|
|
||
| # NCrunch | ||
| _NCrunch_* | ||
| .*crunch*.local.xml | ||
| nCrunchTemp_* | ||
|
|
||
| # MightyMoose | ||
| *.mm.* | ||
| AutoTest.Net/ | ||
|
|
||
| # Web workbench (sass) | ||
| .sass-cache/ | ||
|
|
||
| # Installshield output folder | ||
| [Ee]xpress/ | ||
|
|
||
| # DocProject is a documentation generator add-in | ||
| DocProject/buildhelp/ | ||
| DocProject/Help/*.HxT | ||
| DocProject/Help/*.HxC | ||
| DocProject/Help/*.hhc | ||
| DocProject/Help/*.hhk | ||
| DocProject/Help/*.hhp | ||
| DocProject/Help/Html2 | ||
| DocProject/Help/html | ||
|
|
||
| # Click-Once directory | ||
| publish/ | ||
|
|
||
| # Publish Web Output | ||
| *.[Pp]ublish.xml | ||
| *.azurePubxml | ||
| # Note: Comment the next line if you want to checkin your web deploy settings, | ||
| # but database connection strings (with potential passwords) will be unencrypted | ||
| *.pubxml | ||
| *.publishproj | ||
|
|
||
| # Microsoft Azure Web App publish settings. Comment the next line if you want to | ||
| # checkin your Azure Web App publish settings, but sensitive information contained | ||
| # in these scripts will be unencrypted | ||
| PublishScripts/ | ||
|
|
||
| # NuGet Packages | ||
| *.nupkg | ||
| # NuGet Symbol Packages | ||
| *.snupkg | ||
| # The packages folder can be ignored because of Package Restore | ||
| **/[Pp]ackages/* | ||
| # except build/, which is used as an MSBuild target. | ||
| !**/[Pp]ackages/build/ | ||
| # Uncomment if necessary however generally it will be regenerated when needed | ||
| #!**/[Pp]ackages/repositories.config | ||
| # NuGet v3's project.json files produces more ignorable files | ||
| *.nuget.props | ||
| *.nuget.targets | ||
|
|
||
| # Microsoft Azure Build Output | ||
| csx/ | ||
| *.build.csdef | ||
|
|
||
| # Microsoft Azure Emulator | ||
| ecf/ | ||
| rcf/ | ||
|
|
||
| # Windows Store app package directories and files | ||
| AppPackages/ | ||
| BundleArtifacts/ | ||
| Package.StoreAssociation.xml | ||
| _pkginfo.txt | ||
| *.appx | ||
| *.appxbundle | ||
| *.appxupload | ||
|
|
||
| # Visual Studio cache files | ||
| # files ending in .cache can be ignored | ||
| *.[Cc]ache | ||
| # but keep track of directories ending in .cache | ||
| !?*.[Cc]ache/ | ||
|
|
||
| # Others | ||
| ClientBin/ | ||
| ~$* | ||
| *~ | ||
| *.dbmdl | ||
| *.dbproj.schemaview | ||
| *.jfm | ||
| *.pfx | ||
| *.publishsettings | ||
| orleans.codegen.cs | ||
|
|
||
| # Including strong name files can present a security risk | ||
| # (https://github.com/github/gitignore/pull/2483#issue-259490424) | ||
| #*.snk | ||
|
|
||
| # Since there are multiple workflows, uncomment next line to ignore bower_components | ||
| # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) | ||
| #bower_components/ | ||
|
|
||
| # RIA/Silverlight projects | ||
| Generated_Code/ | ||
|
|
||
| # Backup & report files from converting an old project file | ||
| # to a newer Visual Studio version. Backup files are not needed, | ||
| # because we have git ;-) | ||
| _UpgradeReport_Files/ | ||
| Backup*/ | ||
| UpgradeLog*.XML | ||
| UpgradeLog*.htm | ||
| ServiceFabricBackup/ | ||
| *.rptproj.bak | ||
|
|
||
| # SQL Server files | ||
| *.mdf | ||
| *.ldf | ||
| *.ndf | ||
|
|
||
| # Business Intelligence projects | ||
| *.rdl.data | ||
| *.bim.layout | ||
| *.bim_*.settings | ||
| *.rptproj.rsuser | ||
| *- [Bb]ackup.rdl | ||
| *- [Bb]ackup ([0-9]).rdl | ||
| *- [Bb]ackup ([0-9][0-9]).rdl | ||
|
|
||
| # Microsoft Fakes | ||
| FakesAssemblies/ | ||
|
|
||
| # GhostDoc plugin setting file | ||
| *.GhostDoc.xml | ||
|
|
||
| # Node.js Tools for Visual Studio | ||
| .ntvs_analysis.dat | ||
| node_modules/ | ||
|
|
||
| # Visual Studio 6 build log | ||
| *.plg | ||
|
|
||
| # Visual Studio 6 workspace options file | ||
| *.opt | ||
|
|
||
| # Visual Studio 6 auto-generated workspace file (contains which files were open etc.) | ||
| *.vbw | ||
|
|
||
| # Visual Studio LightSwitch build output | ||
| **/*.HTMLClient/GeneratedArtifacts | ||
| **/*.DesktopClient/GeneratedArtifacts | ||
| **/*.DesktopClient/ModelManifest.xml | ||
| **/*.Server/GeneratedArtifacts | ||
| **/*.Server/ModelManifest.xml | ||
| _Pvt_Extensions | ||
|
|
||
| # Paket dependency manager | ||
| .paket/paket.exe | ||
| paket-files/ | ||
|
|
||
| # FAKE - F# Make | ||
| .fake/ | ||
|
|
||
| # CodeRush personal settings | ||
| .cr/personal | ||
|
|
||
| # Python Tools for Visual Studio (PTVS) | ||
| __pycache__/ | ||
| *.pyc | ||
|
|
||
| # Cake - Uncomment if you are using it | ||
| # tools/** | ||
| # !tools/packages.config | ||
|
|
||
| # Tabs Studio | ||
| *.tss | ||
|
|
||
| # Telerik's JustMock configuration file | ||
| *.jmconfig | ||
|
|
||
| # BizTalk build output | ||
| *.btp.cs | ||
| *.btm.cs | ||
| *.odx.cs | ||
| *.xsd.cs | ||
|
|
||
| # OpenCover UI analysis results | ||
| OpenCover/ | ||
|
|
||
| # Azure Stream Analytics local run output | ||
| ASALocalRun/ | ||
|
|
||
| # MSBuild Binary and Structured Log | ||
| *.binlog | ||
|
|
||
| # NVidia Nsight GPU debugger configuration file | ||
| *.nvuser | ||
|
|
||
| # MFractors (Xamarin productivity tool) working folder | ||
| .mfractor/ | ||
|
|
||
| # Local History for Visual Studio | ||
| .localhistory/ | ||
|
|
||
| # BeatPulse healthcheck temp database | ||
| healthchecksdb | ||
|
|
||
| # Backup folder for Package Reference Convert tool in Visual Studio 2017 | ||
| MigrationBackup/ | ||
|
|
||
| # Ionide (cross platform F# VS Code tools) working folder | ||
| .ionide/ | ||
|
|
||
| # Fody - auto-generated XML schema | ||
| FodyWeavers.xsd |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.