diff --git a/README.md b/README.md index e05d1300..1638dc90 100644 --- a/README.md +++ b/README.md @@ -61,12 +61,12 @@ Linking the package manually is not required anymore with [Autolinking](https:// - **Windows Platform:** - Autolinking status is unknown on Windows. If you need to manually link, see the [Manual linking steps for Windows](#manual-linking-windows) below. + Autolinking works on RNW >= 0.63. If you need to manually link, see the [Manual linking steps for Windows](#manual-linking-windows) below.
Manually link the library on Windows -#### Link C++ implementation +#### Link to your C++ app (RNW >= 0.62) * Open the solution in Visual Studio for your Windows apps * Right click in the Explorer and click Add > Existing Project... * Navigate to `.//node_modules/@react-native-community/netinfo/windows/RNCNetInfoCPP/` and add `RNCNetInfoCPP.vcxproj` @@ -75,23 +75,14 @@ Linking the package manually is not required anymore with [Autolinking](https:// * Open `pch.h`, add `#include "winrt/ReactNativeNetInfo.h"` * Open `App.cpp`, add `PackageProviders().Append(winrt::ReactNativeNetInfo::ReactPackageProvider());` before `InitializeComponent();` -#### Link C# implementation +#### Link C# to your C# app (RNW >= 0.62) * Open the solution in Visual Studio for your Windows apps * Right click in the Explorer and click Add > Existing Project... -* Navigate to `.//node_modules/@react-native-community/netinfo/windows/RNCNetInfo/` and add `RNCNetInfo.csproj` +* Navigate to `.//node_modules/@react-native-community/netinfo/windows/RNCNetInfoCPP/` and add `RNCNetInfoCPP.vcxproj` * This time right click on your React Native Windows app under your solutions directory and click Add > Reference... -* Check the `RNCNetInfo` you just added and press ok -* Open up `MainReactNativeHost.cs` for your app and edit the file like so: - -```diff -+ using ReactNativeCommunity.NetInfo; -...... - protected override List Packages => new List - { - new MainReactPackage(), -+ new RNCNetInfoPackage(), - }; -``` +* Check the `RNCNetInfoCPP` you just added and press ok +* Open up `App.xaml.cs` for your app and add `using ReactNativeNetInfo;` to the top. +* Open up `App.xaml.cs` for your app and add `PackageProviders.Add(new ReactNativeNetInfo.ReactPackageProvider());` before `InitializeComponent();`
diff --git a/example/windows/NetInfoExample.sln b/example/windows/NetInfoExample.sln index da40c7d3..c4a49487 100644 --- a/example/windows/NetInfoExample.sln +++ b/example/windows/NetInfoExample.sln @@ -38,7 +38,6 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\node_modules\react-native-windows\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 - ..\..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{37e37094-01b3-44a5-aab7-f0379b1ce8fa}*SharedItemsImports = 4 ..\..\node_modules\react-native-windows\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 ..\..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9 ..\..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9 diff --git a/package.json b/package.json index d4dfd30b..940fe7cc 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "react-native-codegen": "^0.0.8", "react-native-macos": "0.60.0-microsoft.50", "react-native-web": "^0.17.5", - "react-native-windows": "0.65.6", + "react-native-windows": "0.65.8", "react-test-renderer": "17.0.2", "rimraf": "^2.6.3", "semantic-release": "^17.4.6", diff --git a/react-native.config.js b/react-native.config.js index eea7f3b1..429ec4f9 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -25,7 +25,14 @@ let config = { }, android:{ sourceDir: 'example/android', - } + }, + windows:{ + sourceDir: 'example\\windows', + solutionFile: 'NetInfoExample.sln', + project: { + projectFile: 'NetInfoExample\\NetInfoExample.vcxproj', + }, + }, }, } if (process.argv.includes(macSwitch)) { diff --git a/windows/.gitignore b/windows/.gitignore index a57fdbbc..878f7ba5 100644 --- a/windows/.gitignore +++ b/windows/.gitignore @@ -1,353 +1,92 @@ -## 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/ -[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/ - -# 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, .xml, .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/ \ No newline at end of file +*AppPackages* +*BundleArtifacts* + +#OS junk files +[Tt]humbs.db +*.DS_Store + +#Visual Studio files +*.[Oo]bj +*.user +*.aps +*.pch +*.vspscc +*.vssscc +*_i.c +*_p.c +*.ncb +*.suo +*.tlb +*.tlh +*.bak +*.[Cc]ache +*.ilk +*.log +*.lib +*.sbr +*.sdf +*.opensdf +*.opendb +*.unsuccessfulbuild +ipch/ +[Oo]bj/ +[Bb]in +[Dd]ebug*/ +[Rr]elease*/ +Ankh.NoLoad + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +#MonoDevelop +*.pidb +*.userprefs + +#Tooling +_ReSharper*/ +*.resharper +[Tt]est[Rr]esult* +*.sass-cache + +#Project files +[Bb]uild/ + +#Subversion files +.svn + +# Office Temp Files +~$* + +# vim Temp Files +*~ + +#NuGet +packages/ +*.nupkg + +#ncrunch +*ncrunch* +*crunch*.local.xml + +# visual studio database projects +*.dbmdl + +#Test files +*.testsettings + +#Other files +*.DotSettings +.vs/ +*project.lock.json + +#Files generated by the VS build +**/Generated Files/** + diff --git a/windows/ExperimentalFeatures.props b/windows/ExperimentalFeatures.props new file mode 100644 index 00000000..22c104b2 --- /dev/null +++ b/windows/ExperimentalFeatures.props @@ -0,0 +1,10 @@ + + + + + + diff --git a/windows/NuGet.Config b/windows/NuGet.Config new file mode 100644 index 00000000..c7612b0b --- /dev/null +++ b/windows/NuGet.Config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/windows/RNCNetInfo.sln b/windows/RNCNetInfo.sln index 49efdff4..37780c14 100644 --- a/windows/RNCNetInfo.sln +++ b/windows/RNCNetInfo.sln @@ -1,38 +1,41 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 -VisualStudioVersion = 16.0.29911.84 +VisualStudioVersion = 16.0.29215.179 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{35C09822-97F4-4686-AB69-C8C9AB74B09D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RNCNetInfoCPP", "RNCNetInfoCPP\RNCNetInfoCPP.vcxproj", "{37E37094-01B3-44A5-AAB7-F0379B1CE8FA}" + ProjectSection(ProjectDependencies) = postProject + {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\node_modules\react-native-windows\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\node_modules\react-native-windows\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\node_modules\react-native-windows\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\node_modules\react-native-windows\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\node_modules\react-native-windows\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\node_modules\react-native-windows\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}" + ProjectSection(ProjectDependencies) = postProject + {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\node_modules\react-native-windows\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\node_modules\react-native-windows\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\node_modules\react-native-windows\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\node_modules\react-native-windows\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\node_modules\react-native-windows\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\node_modules\react-native-windows\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RNCNetInfoCPP", "RNCNetInfoCPP\RNCNetInfoCPP.vcxproj", "{37E37094-01B3-44A5-AAB7-F0379B1CE8FA}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ReactNative.Managed", "..\node_modules\react-native-windows\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.csproj", "{F2824844-CE15-4242-9420-308923CD76C3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\node_modules\react-native-windows\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\node_modules\react-native-windows\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\node_modules\react-native-windows\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\node_modules\react-native-windows\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 - ..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{37e37094-01b3-44a5-aab7-f0379b1ce8fa}*SharedItemsImports = 4 ..\node_modules\react-native-windows\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 ..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9 ..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9 @@ -43,161 +46,80 @@ Global ..\node_modules\react-native-windows\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Development|ARM = Development|ARM - Development|ARM64 = Development|ARM64 - Development|x64 = Development|x64 - Development|x86 = Development|x86 - Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.ActiveCfg = Debug|ARM - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.Build.0 = Debug|ARM - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.Build.0 = Debug|ARM64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Development|ARM.ActiveCfg = Debug|ARM - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Development|ARM.Build.0 = Debug|ARM - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Development|ARM64.ActiveCfg = Debug|ARM64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Development|ARM64.Build.0 = Debug|ARM64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Development|x64.ActiveCfg = Debug|x64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Development|x64.Build.0 = Debug|x64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Development|x86.ActiveCfg = Debug|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Development|x86.Build.0 = Debug|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.ActiveCfg = Release|ARM - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.Build.0 = Release|ARM - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.ActiveCfg = Release|ARM64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.Build.0 = Release|ARM64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.ActiveCfg = Debug|ARM - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.Build.0 = Debug|ARM + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|ARM64.Build.0 = Debug|ARM64 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|x64.ActiveCfg = Debug|x64 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|x64.Build.0 = Debug|x64 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|x64.Deploy.0 = Debug|x64 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|x86.ActiveCfg = Debug|Win32 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|x86.Build.0 = Debug|Win32 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|x86.Deploy.0 = Debug|Win32 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|ARM64.ActiveCfg = Release|ARM64 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|ARM64.Build.0 = Release|ARM64 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|ARM64.Deploy.0 = Release|ARM64 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|x64.ActiveCfg = Release|x64 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|x64.Build.0 = Release|x64 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|x64.Deploy.0 = Release|x64 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|x86.ActiveCfg = Release|Win32 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|x86.Build.0 = Release|Win32 + {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|x86.Deploy.0 = Release|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Development|ARM.ActiveCfg = Debug|ARM - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Development|ARM.Build.0 = Debug|ARM - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Development|ARM64.ActiveCfg = Debug|ARM64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Development|ARM64.Build.0 = Debug|ARM64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Development|x64.ActiveCfg = Debug|x64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Development|x64.Build.0 = Debug|x64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Development|x86.ActiveCfg = Debug|Win32 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Development|x86.Build.0 = Debug|Win32 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.ActiveCfg = Release|ARM - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.Build.0 = Release|ARM {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.ActiveCfg = Release|ARM64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Release|ARM64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.Build.0 = Debug|ARM - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.Build.0 = Debug|ARM64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.ActiveCfg = Debug|x64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.Build.0 = Debug|x64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.ActiveCfg = Debug|Win32 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.Build.0 = Debug|Win32 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Development|ARM.ActiveCfg = Debug|ARM - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Development|ARM.Build.0 = Debug|ARM - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Development|ARM64.ActiveCfg = Debug|ARM64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Development|ARM64.Build.0 = Debug|ARM64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Development|x64.ActiveCfg = Debug|x64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Development|x64.Build.0 = Debug|x64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Development|x86.ActiveCfg = Debug|Win32 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Development|x86.Build.0 = Debug|Win32 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.ActiveCfg = Release|ARM - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.Build.0 = Release|ARM - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.ActiveCfg = Release|ARM64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.Build.0 = Release|ARM64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.ActiveCfg = Release|x64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.Build.0 = Release|x64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.ActiveCfg = Release|Win32 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.Build.0 = Release|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.ActiveCfg = Debug|ARM - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.Build.0 = Debug|ARM {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.ActiveCfg = Debug|ARM64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.Build.0 = Debug|ARM64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.Build.0 = Debug|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.ActiveCfg = Debug|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.Build.0 = Debug|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Development|ARM.ActiveCfg = Debug|ARM - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Development|ARM.Build.0 = Debug|ARM - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Development|ARM64.ActiveCfg = Debug|ARM64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Development|ARM64.Build.0 = Debug|ARM64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Development|x64.ActiveCfg = Debug|x64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Development|x64.Build.0 = Debug|x64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Development|x86.ActiveCfg = Debug|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Development|x86.Build.0 = Debug|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.ActiveCfg = Release|ARM - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.Build.0 = Release|ARM {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.ActiveCfg = Release|ARM64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.Build.0 = Release|ARM64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.ActiveCfg = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|ARM.ActiveCfg = Debug|ARM - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|ARM.Build.0 = Debug|ARM - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|ARM64.ActiveCfg = Debug|Win32 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|x64.ActiveCfg = Debug|x64 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|x64.Build.0 = Debug|x64 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|x86.ActiveCfg = Debug|Win32 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Debug|x86.Build.0 = Debug|Win32 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Development|ARM.ActiveCfg = Debug|ARM - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Development|ARM.Build.0 = Debug|ARM - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Development|ARM64.ActiveCfg = Release|x64 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Development|ARM64.Build.0 = Release|x64 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Development|x64.ActiveCfg = Debug|x64 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Development|x64.Build.0 = Debug|x64 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Development|x86.ActiveCfg = Debug|Win32 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Development|x86.Build.0 = Debug|Win32 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|ARM.ActiveCfg = Release|ARM - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|ARM.Build.0 = Release|ARM - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|ARM64.ActiveCfg = Release|Win32 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|x64.ActiveCfg = Release|x64 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|x64.Build.0 = Release|x64 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|x86.ActiveCfg = Release|Win32 - {37E37094-01B3-44A5-AAB7-F0379B1CE8FA}.Release|x86.Build.0 = Release|Win32 - {F2824844-CE15-4242-9420-308923CD76C3}.Debug|ARM.ActiveCfg = Debug|x86 - {F2824844-CE15-4242-9420-308923CD76C3}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {F2824844-CE15-4242-9420-308923CD76C3}.Debug|ARM64.Build.0 = Debug|ARM64 - {F2824844-CE15-4242-9420-308923CD76C3}.Debug|x64.ActiveCfg = Debug|x64 - {F2824844-CE15-4242-9420-308923CD76C3}.Debug|x64.Build.0 = Debug|x64 - {F2824844-CE15-4242-9420-308923CD76C3}.Debug|x86.ActiveCfg = Debug|x86 - {F2824844-CE15-4242-9420-308923CD76C3}.Debug|x86.Build.0 = Debug|x86 - {F2824844-CE15-4242-9420-308923CD76C3}.Development|ARM.ActiveCfg = Debug|Win32 - {F2824844-CE15-4242-9420-308923CD76C3}.Development|ARM.Build.0 = Debug|Win32 - {F2824844-CE15-4242-9420-308923CD76C3}.Development|ARM64.ActiveCfg = Debug|ARM64 - {F2824844-CE15-4242-9420-308923CD76C3}.Development|ARM64.Build.0 = Debug|ARM64 - {F2824844-CE15-4242-9420-308923CD76C3}.Development|x64.ActiveCfg = Debug|x64 - {F2824844-CE15-4242-9420-308923CD76C3}.Development|x64.Build.0 = Debug|x64 - {F2824844-CE15-4242-9420-308923CD76C3}.Development|x86.ActiveCfg = Debug|x86 - {F2824844-CE15-4242-9420-308923CD76C3}.Development|x86.Build.0 = Debug|x86 - {F2824844-CE15-4242-9420-308923CD76C3}.Release|ARM.ActiveCfg = Release|x86 - {F2824844-CE15-4242-9420-308923CD76C3}.Release|ARM64.ActiveCfg = Release|ARM64 - {F2824844-CE15-4242-9420-308923CD76C3}.Release|ARM64.Build.0 = Release|ARM64 - {F2824844-CE15-4242-9420-308923CD76C3}.Release|x64.ActiveCfg = Release|x64 - {F2824844-CE15-4242-9420-308923CD76C3}.Release|x64.Build.0 = Release|x64 - {F2824844-CE15-4242-9420-308923CD76C3}.Release|x86.ActiveCfg = Release|x86 - {F2824844-CE15-4242-9420-308923CD76C3}.Release|x86.Build.0 = Release|x86 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM.ActiveCfg = Debug|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.Build.0 = Debug|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.ActiveCfg = Debug|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.Build.0 = Debug|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.ActiveCfg = Debug|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.Build.0 = Debug|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.ActiveCfg = Release|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.Build.0 = Release|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.ActiveCfg = Release|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.Build.0 = Release|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.ActiveCfg = Release|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.Build.0 = Release|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.Build.0 = Debug|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.ActiveCfg = Release|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.Build.0 = Release|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64.ActiveCfg = Debug|ARM64 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64.Build.0 = Debug|ARM64 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.ActiveCfg = Debug|x64 @@ -205,17 +127,6 @@ Global {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.ActiveCfg = Debug|Win32 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.Build.0 = Debug|Win32 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.Deploy.0 = Debug|Win32 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Development|ARM.ActiveCfg = Debug|Win32 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Development|ARM.Build.0 = Debug|Win32 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Development|ARM.Deploy.0 = Debug|Win32 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Development|ARM64.ActiveCfg = Debug|ARM64 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Development|ARM64.Build.0 = Debug|ARM64 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Development|x64.ActiveCfg = Debug|x64 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Development|x64.Build.0 = Debug|x64 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Development|x86.ActiveCfg = Debug|Win32 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Development|x86.Build.0 = Debug|Win32 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Development|x86.Deploy.0 = Debug|Win32 - {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM.ActiveCfg = Release|Win32 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64.ActiveCfg = Release|ARM64 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64.Build.0 = Release|ARM64 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.ActiveCfg = Release|x64 @@ -228,19 +139,18 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {35C09822-97F4-4686-AB69-C8C9AB74B09D} - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {35C09822-97F4-4686-AB69-C8C9AB74B09D} - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {35C09822-97F4-4686-AB69-C8C9AB74B09D} - {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {35C09822-97F4-4686-AB69-C8C9AB74B09D} - {DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B} = {35C09822-97F4-4686-AB69-C8C9AB74B09D} - {84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E} = {35C09822-97F4-4686-AB69-C8C9AB74B09D} - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {35C09822-97F4-4686-AB69-C8C9AB74B09D} - {2049DBE9-8D13-42C9-AE4B-413AE38FFFD0} = {35C09822-97F4-4686-AB69-C8C9AB74B09D} - {F2824844-CE15-4242-9420-308923CD76C3} = {35C09822-97F4-4686-AB69-C8C9AB74B09D} - {EF074BA1-2D54-4D49-A28E-5E040B47CD2E} = {35C09822-97F4-4686-AB69-C8C9AB74B09D} - {14B93DC8-FD93-4A6D-81CB-8BC96644501C} = {35C09822-97F4-4686-AB69-C8C9AB74B09D} + {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {2049DBE9-8D13-42C9-AE4B-413AE38FFFD0} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {EF074BA1-2D54-4D49-A28E-5E040B47CD2E} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {14B93DC8-FD93-4A6D-81CB-8BC96644501C} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {71E0A77E-78DB-4B21-8B4A-812B8B262820} + SolutionGuid = {D43FAD39-F619-437D-BB40-04A3982ACB6A} EndGlobalSection EndGlobal diff --git a/windows/RNCNetInfo/DefaultNetworkInformation.cs b/windows/RNCNetInfo/DefaultNetworkInformation.cs deleted file mode 100644 index db106cbc..00000000 --- a/windows/RNCNetInfo/DefaultNetworkInformation.cs +++ /dev/null @@ -1,129 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using Windows.Networking.Connectivity; - -namespace ReactNativeCommunity.NetInfo -{ - class DefaultNetworkInformation : INetworkInformation - { - public event NetworkStatusChangedEventHandler NetworkStatusChanged; - - public void Start() - { - NetworkInformation.NetworkStatusChanged += OnNetworkStatusChanged; - } - - public void Stop() - { - NetworkInformation.NetworkStatusChanged -= OnNetworkStatusChanged; - } - - public IConnectionProfile GetInternetConnectionProfile() - { - var profile = NetworkInformation.GetInternetConnectionProfile(); - return profile != null - ? new ConnectionProfileImpl(profile) - : null; - } - - private void OnNetworkStatusChanged(object sender) - { - NetworkStatusChanged?.Invoke(sender); - } - - class ConnectionProfileImpl : IConnectionProfile - { - private readonly ConnectionProfile _profile; - - public ConnectionProfileImpl(ConnectionProfile profile) - { - _profile = profile; - } - - public NetworkConnectivityLevel ConnectivityLevel - { - get - { - return _profile.GetNetworkConnectivityLevel(); - } - } - - public NetworkConnectionType ConnectionType - { - get - { - if (_profile.IsWlanConnectionProfile) - { - return NetworkConnectionType.Wifi; - } - else if (_profile.IsWwanConnectionProfile) - { - return NetworkConnectionType.Cellular; - } - - var networkAdapter = _profile.NetworkAdapter; - if (networkAdapter == null) - { - return NetworkConnectionType.Unknown; - } - - // Possible values: https://www.iana.org/assignments/ianaiftype-mib/ianaiftype-mib - if (networkAdapter.IanaInterfaceType == 6u) - { - return NetworkConnectionType.Ethernet; - } - else - { - return NetworkConnectionType.Other; - } - } - } - - public CellularGeneration CellularGeneration - { - get - { - if (!_profile.IsWwanConnectionProfile) - { - return CellularGeneration.None; - } - - var dataClass = _profile.WwanConnectionProfileDetails.GetCurrentDataClass(); - - switch (dataClass) { - case WwanDataClass.None: - return CellularGeneration.None; - case WwanDataClass.Edge: - case WwanDataClass.Gprs: - return CellularGeneration.Generation2; - case WwanDataClass.Cdma1xEvdo: - case WwanDataClass.Cdma1xEvdoRevA: - case WwanDataClass.Cdma1xEvdoRevB: - case WwanDataClass.Cdma1xEvdv: - case WwanDataClass.Cdma1xRtt: - case WwanDataClass.Cdma3xRtt: - case WwanDataClass.Hsdpa: - case WwanDataClass.Hsupa: - case WwanDataClass.Umts: - return CellularGeneration.Generation3; - case WwanDataClass.CdmaUmb: - case WwanDataClass.LteAdvanced: - return CellularGeneration.Generation4; - case WwanDataClass.Custom: - default: - return CellularGeneration.Unknown; - } - } - } - - public NetworkCostType ConnectionCost - { - get - { - return _profile.GetConnectionCost().NetworkCostType; - } - } - } - } -} diff --git a/windows/RNCNetInfo/IConnectionProfile.cs b/windows/RNCNetInfo/IConnectionProfile.cs deleted file mode 100644 index a3231344..00000000 --- a/windows/RNCNetInfo/IConnectionProfile.cs +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using Windows.Networking.Connectivity; - -namespace ReactNativeCommunity.NetInfo -{ - public enum NetworkConnectionType - { - Unknown, - None, - Cellular, - Ethernet, - Wifi, - Other - } - - public enum CellularGeneration - { - Unknown, - None, - Generation2, - Generation3, - Generation4 - } - - /// - /// An interface for network connection profiles. - /// - public interface IConnectionProfile - { - /// - /// A value that indicates the network connectivity level. - /// - NetworkConnectivityLevel ConnectivityLevel { get; } - - /// - /// A value that indicates the network connection type. - /// - NetworkConnectionType ConnectionType { get; } - - /// - /// A value that indicates the cellular generation currently in use, if ConnectionType is Cellular. - /// - CellularGeneration CellularGeneration { get; } - - /// - /// A value that indicates the network connection cost, i.e. is the connection metered. - /// - NetworkCostType ConnectionCost { get; } - } -} diff --git a/windows/RNCNetInfo/INetworkInformation.cs b/windows/RNCNetInfo/INetworkInformation.cs deleted file mode 100644 index b45d9267..00000000 --- a/windows/RNCNetInfo/INetworkInformation.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using Windows.Networking.Connectivity; - -namespace ReactNativeCommunity.NetInfo -{ - /// - /// An interface for network information status and updates. - /// - public interface INetworkInformation - { - /// - /// An event that occurs whenever the network status changes. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1009:DeclareEventHandlersCorrectly", Justification = "API matches Windows.Networking.Connectivity.NetworkingInformation.")] - event NetworkStatusChangedEventHandler NetworkStatusChanged; - - /// - /// Gets the connection profile associated with the internet connection - /// currently used by the local machine. - /// - /// - /// The profile for the connection currently used to connect the machine - /// to the Internet, or null if there is no connection profile with a - /// suitable connection. - /// - IConnectionProfile GetInternetConnectionProfile(); - - /// - /// Starts observing network status changes. - /// - void Start(); - - /// - /// Stops observing network status changes. - /// - void Stop(); - } -} diff --git a/windows/RNCNetInfo/Properties/AssemblyInfo.cs b/windows/RNCNetInfo/Properties/AssemblyInfo.cs deleted file mode 100644 index eca6f346..00000000 --- a/windows/RNCNetInfo/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("RNCNetInfo")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("RNCNetInfo")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/windows/RNCNetInfo/Properties/RNCNetInfo.rd.xml b/windows/RNCNetInfo/Properties/RNCNetInfo.rd.xml deleted file mode 100644 index 6386c02f..00000000 --- a/windows/RNCNetInfo/Properties/RNCNetInfo.rd.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - diff --git a/windows/RNCNetInfo/RNCNetInfo.csproj b/windows/RNCNetInfo/RNCNetInfo.csproj deleted file mode 100644 index ad560e94..00000000 --- a/windows/RNCNetInfo/RNCNetInfo.csproj +++ /dev/null @@ -1,157 +0,0 @@ - - - - - Debug - x86 - {4ACDD44C-E556-423E-BD74-B4CEF3E67FF0} - Library - Properties - RNCNetInfo - RNCNetInfo - en-US - UAP - 10.0.14393.0 - 10.0.14393.0 - 14 - 512 - {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\node_modules - - - ..\..\..\.. - - - x86 - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x86 - false - prompt - - - x86 - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x86 - false - prompt - - - ARM - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - - - ARM - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - - - x64 - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x64 - false - prompt - - - x64 - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x64 - false - prompt - - - - - - - - - - - - - 6.0.6 - - - - - {c7673ad5-e3aa-468c-a5fd-fa38154e205c} - ReactNative - - - - 14.0 - - - true - bin\x86\Development\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - true - full - x86 - false - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ARM\Development\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - true - full - ARM - false - prompt - MinimumRecommendedRules.ruleset - - - true - bin\x64\Development\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - true - full - x64 - false - prompt - MinimumRecommendedRules.ruleset - - - - \ No newline at end of file diff --git a/windows/RNCNetInfo/RNCNetInfoModule.cs b/windows/RNCNetInfo/RNCNetInfoModule.cs deleted file mode 100644 index bba4dbfe..00000000 --- a/windows/RNCNetInfo/RNCNetInfoModule.cs +++ /dev/null @@ -1,219 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Portions derived from React Native: -// Copyright (c) 2015-present, Facebook, Inc. -// Licensed under the MIT License. - -using Newtonsoft.Json.Linq; -using ReactNative.Bridge; -using ReactNative.Modules.Core; -using Windows.Networking.Connectivity; - -namespace ReactNativeCommunity.NetInfo -{ - /// - /// Module that monitors and provides information about the connectivity - /// state of the device. - /// - public class RNCNetInfoModule : ReactContextNativeModuleBase, ILifecycleEventListener - { - // These constants need to match the strings defined in types.ts - private const string CONNECTION_TYPE_CELLULAR = "cellular"; - private const string CONNECTION_TYPE_ETHERNET = "ethernet"; - private const string CONNECTION_TYPE_NONE = "none"; - private const string CONNECTION_TYPE_UNKNOWN = "unknown"; - private const string CONNECTION_TYPE_WIFI = "wifi"; - private const string CONNECTION_TYPE_OTHER = "other"; - - private const string CELLULAR_GENERATION_2G = "2g"; - private const string CELLULAR_GENERATION_3G = "3g"; - private const string CELLULAR_GENERATION_4G = "4g"; - private const string CELLULAR_GENERATION_NONE = null; - private const string CELLULAR_GENERATION_UNKNOWN = null; - - private readonly INetworkInformation _networkInfo; - - /// - /// Instantiates the . - /// - /// The React context. - public RNCNetInfoModule(ReactContext reactContext) - : this(new DefaultNetworkInformation(), reactContext) - { - } - - /// - /// Instantiates the . - /// - /// The network information. - /// The React context. - public RNCNetInfoModule(INetworkInformation networkInfo, ReactContext reactContext) - : base(reactContext) - { - _networkInfo = networkInfo; - } - - /// - /// Gets the name of the native module. - /// - public override string Name - { - get - { - return "RNCNetInfo"; - } - } - - /// - /// Gets the current connectivity state of the app. - /// - /// The interface from which to obtain the information (not currently supported) - /// A promise to resolve the request. - [ReactMethod] - public void getCurrentState(String requestedInterface, IPromise promise) - { - promise.Resolve(CreateConnectivityEventMap()); - } - - /// - /// Called when the application host is destroyed. - /// - public void OnDestroy() - { - } - - /// - /// Called when the application host is resumed. - /// - public void OnResume() - { - _networkInfo.Start(); - _networkInfo.NetworkStatusChanged += OnStatusChanged; - } - - /// - /// Called when the application host is suspended. - /// - public void OnSuspend() - { - _networkInfo.NetworkStatusChanged -= OnStatusChanged; - _networkInfo.Stop(); - } - - /// - /// Called when the React instance is initialized. - /// - public override void Initialize() - { - Context.AddLifecycleEventListener(this); - } - - private JObject CreateConnectivityEventMap() - { - var eventMap = new JObject(); - - // Add the connection type information - var type = GetConnectivityType(); - eventMap.Add("type", type); - - // Add the connection state information - var isConnected = GetIsConnected(); - eventMap.Add("isConnected", isConnected); - - // Add the details, if there are any - JObject details = null; - if (isConnected) - { - details = new JObject(); - - var isConnectionExpensive = GetIsConnectionExpensive(); - details.Add("isConnectionExpensive", isConnectionExpensive); - - if (type == CONNECTION_TYPE_CELLULAR) - { - var cellularGeneration = GetCellularGeneration(); - details.Add("cellularGeneration", cellularGeneration); - } - } - eventMap.Add("details", details); - - return eventMap; - } - - private string GetConnectivityType() - { - var profile = _networkInfo.GetInternetConnectionProfile(); - if (profile == null) - { - return CONNECTION_TYPE_NONE; - } - - switch (profile.ConnectionType) - { - case NetworkConnectionType.Unknown: - return CONNECTION_TYPE_UNKNOWN; - case NetworkConnectionType.None: - return CONNECTION_TYPE_NONE; - case NetworkConnectionType.Cellular: - return CONNECTION_TYPE_CELLULAR; - case NetworkConnectionType.Ethernet: - return CONNECTION_TYPE_ETHERNET; - case NetworkConnectionType.Wifi: - return CONNECTION_TYPE_WIFI; - case NetworkConnectionType.Other: - return CONNECTION_TYPE_OTHER; - default: - return CONNECTION_TYPE_UNKNOWN; - } - } - - private string GetCellularGeneration() - { - var profile = _networkInfo.GetInternetConnectionProfile(); - if (profile == null) - { - return CELLULAR_GENERATION_NONE; - } - - switch (profile.CellularGeneration) - { - case CellularGeneration.Unknown: - return CELLULAR_GENERATION_UNKNOWN; - case CellularGeneration.None: - return CELLULAR_GENERATION_NONE; - case CellularGeneration.Generation2: - return CELLULAR_GENERATION_2G; - case CellularGeneration.Generation3: - return CELLULAR_GENERATION_3G; - case CellularGeneration.Generation4: - return CELLULAR_GENERATION_4G; - default: - return CELLULAR_GENERATION_UNKNOWN; - } - } - - private bool GetIsConnected() - { - var profile = _networkInfo.GetInternetConnectionProfile(); - return profile != null && profile.ConnectivityLevel != NetworkConnectivityLevel.None; - } - - private bool GetIsConnectionExpensive() - { - var profile = _networkInfo.GetInternetConnectionProfile(); - if (profile == null) - { - return false; - } - - var connectionCost = profile.ConnectionCost; - return connectionCost == NetworkCostType.Fixed || connectionCost == NetworkCostType.Variable; - } - - private void OnStatusChanged(object ignored) - { - var connectivity = CreateConnectivityEventMap(); - Context.GetJavaScriptModule() - .emit("netInfo.networkStatusDidChange", CreateConnectivityEventMap()); - } - } -} diff --git a/windows/RNCNetInfo/RNCNetInfoPackage.cs b/windows/RNCNetInfo/RNCNetInfoPackage.cs deleted file mode 100644 index 6e8b447c..00000000 --- a/windows/RNCNetInfo/RNCNetInfoPackage.cs +++ /dev/null @@ -1,53 +0,0 @@ -using ReactNative.Bridge; -using ReactNative.Modules.Core; -using ReactNative.UIManager; -using System; -using System.Collections.Generic; - -namespace ReactNativeCommunity.NetInfo -{ - /// - /// Package defining core framework modules (e.g., ). - /// It should be used for modules that require special integration with - /// other framework parts (e.g., with the list of packages to load view - /// managers from). - /// - public class RNCNetInfoPackage : IReactPackage - { - /// - /// Creates the list of native modules to register with the react - /// instance. - /// - /// The react application context. - /// The list of native modules. - public IReadOnlyList CreateNativeModules(ReactContext reactContext) - { - return new List - { - new RNCNetInfoModule(reactContext), - }; - } - - /// - /// Creates the list of JavaScript modules to register with the - /// react instance. - /// - /// The list of JavaScript modules. - public IReadOnlyList CreateJavaScriptModulesConfig() - { - return new List(0); - } - - /// - /// Creates the list of view managers that should be registered with - /// the . - /// - /// The react application context. - /// The list of view managers. - public IReadOnlyList CreateViewManagers( - ReactContext reactContext) - { - return new List(0); - } - } -} diff --git a/windows/RNCNetInfoCPP/PropertySheet.props b/windows/RNCNetInfoCPP/PropertySheet.props index e34141b0..3e15bb90 100644 --- a/windows/RNCNetInfoCPP/PropertySheet.props +++ b/windows/RNCNetInfoCPP/PropertySheet.props @@ -1,16 +1,16 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/windows/RNCNetInfoCPP/RNCNetInfoCPP.def b/windows/RNCNetInfoCPP/RNCNetInfoCPP.def index 24e7c123..8c1a0293 100644 --- a/windows/RNCNetInfoCPP/RNCNetInfoCPP.def +++ b/windows/RNCNetInfoCPP/RNCNetInfoCPP.def @@ -1,3 +1,3 @@ -EXPORTS -DllCanUnloadNow = WINRT_CanUnloadNow PRIVATE -DllGetActivationFactory = WINRT_GetActivationFactory PRIVATE +EXPORTS +DllCanUnloadNow = WINRT_CanUnloadNow PRIVATE +DllGetActivationFactory = WINRT_GetActivationFactory PRIVATE diff --git a/windows/RNCNetInfoCPP/RNCNetInfoCPP.filters b/windows/RNCNetInfoCPP/RNCNetInfoCPP.filters deleted file mode 100644 index 4833b1a3..00000000 --- a/windows/RNCNetInfoCPP/RNCNetInfoCPP.filters +++ /dev/null @@ -1,31 +0,0 @@ - - - - - accd3aa8-1ba0-4223-9bbe-0c431709210b - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms - - - {926ab91d-31b4-48c3-b9a4-e681349f27f0} - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/windows/RNCNetInfoCPP/RNCNetInfoCPP.vcxproj b/windows/RNCNetInfoCPP/RNCNetInfoCPP.vcxproj index bbf96286..9587f409 100644 --- a/windows/RNCNetInfoCPP/RNCNetInfoCPP.vcxproj +++ b/windows/RNCNetInfoCPP/RNCNetInfoCPP.vcxproj @@ -1,6 +1,7 @@ - - + + + true true @@ -9,7 +10,7 @@ RNCNetInfoCPP ReactNativeNetInfo en-US - 14.0 + 16.0 true Windows Store 10.0 @@ -17,11 +18,22 @@ 10.0.16299.0 + + $([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ + Debug ARM + + Release + ARM + + + Debug + ARM64 + Debug Win32 @@ -30,9 +42,9 @@ Debug x64 - + Release - ARM + ARM64 Release @@ -45,9 +57,6 @@ DynamicLibrary - v140 - v141 - v142 Unicode false @@ -63,18 +72,16 @@ - - - - + + + - Use @@ -82,9 +89,7 @@ $(IntDir)pch.pch Level4 %(AdditionalOptions) /bigobj - - /DWINRT_NO_MAKE_DETECTION %(AdditionalOptions) - 28204 + 4453;28204 _WINRT_DLL;%(PreprocessorDefinitions) $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) @@ -105,21 +110,21 @@ - - ReactPackageProvider.idl + + - Create ReactPackageProvider.idl + @@ -127,31 +132,27 @@ - - - - - - {f7d32bd0-2749-483e-9a0d-1635ef7e3136} - false - - - {f7d32bd0-2749-483e-9a0d-1635ef7e3136} - false - - + + + + + + This project references targets in your node_modules\react-native-windows folder that are missing. The missing file is {0}. + + + + - + - 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}. - - + + \ No newline at end of file diff --git a/windows/RNCNetInfoCPP/RNCNetInfoCPP.vcxproj.filters b/windows/RNCNetInfoCPP/RNCNetInfoCPP.vcxproj.filters new file mode 100644 index 00000000..19ebfadd --- /dev/null +++ b/windows/RNCNetInfoCPP/RNCNetInfoCPP.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/RNCNetInfoCPP/ReactPackageProvider.cpp b/windows/RNCNetInfoCPP/ReactPackageProvider.cpp index 9b23319a..54402ed3 100644 --- a/windows/RNCNetInfoCPP/ReactPackageProvider.cpp +++ b/windows/RNCNetInfoCPP/ReactPackageProvider.cpp @@ -1,14 +1,19 @@ -#include "pch.h" -#include "ReactPackageProvider.h" -#include "ReactPackageProvider.g.cpp" -#include "RNCNetInfo.h" - -using namespace winrt::Microsoft::ReactNative; - -namespace winrt::ReactNativeNetInfo::implementation { - - void ReactPackageProvider::CreatePackage(IReactPackageBuilder const& packageBuilder) noexcept { - AddAttributedModules(packageBuilder); - } - -} // namespace winrt::ReactNativeNetInfo::implementation +#include "pch.h" +#include "ReactPackageProvider.h" +#if __has_include("ReactPackageProvider.g.cpp") +#include "ReactPackageProvider.g.cpp" +#endif + +#include "RNCNetInfo.h" + +using namespace winrt::Microsoft::ReactNative; + +namespace winrt::ReactNativeNetInfo::implementation +{ + +void ReactPackageProvider::CreatePackage(IReactPackageBuilder const &packageBuilder) noexcept +{ + AddAttributedModules(packageBuilder); +} + +} // namespace winrt::ReactNativeNetInfo::implementation diff --git a/windows/RNCNetInfoCPP/ReactPackageProvider.h b/windows/RNCNetInfoCPP/ReactPackageProvider.h index 3350481d..0c5bd4cd 100644 --- a/windows/RNCNetInfoCPP/ReactPackageProvider.h +++ b/windows/RNCNetInfoCPP/ReactPackageProvider.h @@ -1,20 +1,21 @@ -#pragma once -#include "ReactPackageProvider.g.h" - -using namespace winrt::Microsoft::ReactNative; - -namespace winrt::ReactNativeNetInfo::implementation { - - struct ReactPackageProvider : ReactPackageProviderT { - ReactPackageProvider() = default; - - void CreatePackage(IReactPackageBuilder const& packageBuilder) noexcept; - }; - -} // namespace winrt::ReactNativeNetInfo::implementation - -namespace winrt::ReactNativeNetInfo::factory_implementation { - - struct ReactPackageProvider : ReactPackageProviderT {}; - -} // namespace winrt::ReactNativeNetInfo::factory_implementation \ No newline at end of file +#pragma once +#include "ReactPackageProvider.g.h" + +using namespace winrt::Microsoft::ReactNative; + +namespace winrt::ReactNativeNetInfo::implementation +{ + struct ReactPackageProvider : ReactPackageProviderT + { + ReactPackageProvider() = default; + + void CreatePackage(IReactPackageBuilder const &packageBuilder) noexcept; + }; +} // namespace winrt::ReactNativeNetInfo::implementation + +namespace winrt::ReactNativeNetInfo::factory_implementation +{ + +struct ReactPackageProvider : ReactPackageProviderT {}; + +} // namespace winrt::ReactNativeNetInfo::factory_implementation diff --git a/windows/RNCNetInfoCPP/ReactPackageProvider.idl b/windows/RNCNetInfoCPP/ReactPackageProvider.idl index 9f4486ea..dd0cc598 100644 --- a/windows/RNCNetInfoCPP/ReactPackageProvider.idl +++ b/windows/RNCNetInfoCPP/ReactPackageProvider.idl @@ -1,7 +1,9 @@ -namespace ReactNativeNetInfo{ -[webhosthidden] -[default_interface] -runtimeclass ReactPackageProvider : Microsoft.ReactNative.IReactPackageProvider { - ReactPackageProvider(); -}; -} // namespace ReactNativeNetInfo +namespace ReactNativeNetInfo +{ + [webhosthidden] + [default_interface] + runtimeclass ReactPackageProvider : Microsoft.ReactNative.IReactPackageProvider + { + ReactPackageProvider(); + }; +} diff --git a/windows/RNCNetInfoCPP/packages.config b/windows/RNCNetInfoCPP/packages.config index 790637ce..9dcb059f 100644 --- a/windows/RNCNetInfoCPP/packages.config +++ b/windows/RNCNetInfoCPP/packages.config @@ -1,4 +1,4 @@ - - - + + + \ No newline at end of file diff --git a/windows/RNCNetInfoCPP/pch.cpp b/windows/RNCNetInfoCPP/pch.cpp index aef4c60c..e0d2ef1a 100644 --- a/windows/RNCNetInfoCPP/pch.cpp +++ b/windows/RNCNetInfoCPP/pch.cpp @@ -1,3 +1 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -#include "pch.h" +#include "pch.h" diff --git a/windows/RNCNetInfoCPP/pch.h b/windows/RNCNetInfoCPP/pch.h index 78f43b32..4ee087d0 100644 --- a/windows/RNCNetInfoCPP/pch.h +++ b/windows/RNCNetInfoCPP/pch.h @@ -1,18 +1,16 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -#pragma once - -#define NOMINMAX - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#pragma once + +#define NOMINMAX + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +using namespace winrt::Windows::Foundation; diff --git a/yarn.lock b/yarn.lock index 580f6f65..ededf243 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2613,10 +2613,10 @@ resolved "https://registry.yarnpkg.com/@react-native-community/eslint-plugin/-/eslint-plugin-1.1.0.tgz#e42b1bef12d2415411519fd528e64b593b1363dc" integrity sha512-W/J0fNYVO01tioHjvYWQ9m6RgndVtbElzYozBq1ZPrHO/iCzlqoySHl4gO/fpCl9QEFjvJfjPgtPMTMlsoq5DQ== -"@react-native-windows/cli@0.65.2": - version "0.65.2" - resolved "https://registry.yarnpkg.com/@react-native-windows/cli/-/cli-0.65.2.tgz#92b2e5a7028dc60051aa2330445eee51b9af9134" - integrity sha512-KTtc11rjinVHqGw0HqHNKFP2Ex34A8T3DLLGRiAQ/XHcN5jBXGdPDW9zoRZh9bUpk9XMb2Q/Cn3YAjwQd56czg== +"@react-native-windows/cli@0.65.3": + version "0.65.3" + resolved "https://registry.yarnpkg.com/@react-native-windows/cli/-/cli-0.65.3.tgz#948f378b878a8ffc26e57a9dcdbf1f13022a596c" + integrity sha512-3cDyZkzYEOnwr9c1+nppsmQKjsG9QSd8/INUYYSvypwhOMHs7M/L7epECUSlUhh3ldGYAMWQhqvZ53KHgSBL1w== dependencies: "@react-native-windows/package-utils" "0.65.1" "@react-native-windows/telemetry" "0.65.1" @@ -13809,17 +13809,17 @@ react-native-web@^0.17.5: normalize-css-color "^1.0.2" prop-types "^15.6.0" -react-native-windows@0.65.6: - version "0.65.6" - resolved "https://registry.yarnpkg.com/react-native-windows/-/react-native-windows-0.65.6.tgz#ab87d98aab91cb7346bb2f421454eb593ec6f72e" - integrity sha512-D3gS4uX72ssb2IzF9TbAwKmIIRx464b02aptZgeA+cE/eaBPtuJjJoUukBKiWog68aAO62LRGp9HfwJb9vEKPw== +react-native-windows@0.65.8: + version "0.65.8" + resolved "https://registry.yarnpkg.com/react-native-windows/-/react-native-windows-0.65.8.tgz#e11d6f699e484ddb3e3b638b2406390dc391ce1f" + integrity sha512-6BEx5NbKguoDBTpM/f3lCotF2TUsEb1y2U+8/HckuM1f+ZPD5jWbcyB+Bj73MKLCj2hjrZTowDS9BE96MyE1MA== dependencies: "@babel/runtime" "^7.0.0" "@jest/create-cache-key-function" "^27.0.1" "@react-native-community/cli" "^6.0.0" "@react-native-community/cli-platform-android" "^6.0.0" "@react-native-community/cli-platform-ios" "^6.0.0" - "@react-native-windows/cli" "0.65.2" + "@react-native-windows/cli" "0.65.3" "@react-native/assets" "1.0.0" "@react-native/normalize-color" "1.0.0" "@react-native/polyfills" "1.0.0"