Skip to content

Enable Blob module in UWP #10187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JunielKatarn merged 17 commits into from
Jun 26, 2022
Merged

Enable Blob module in UWP #10187

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8116b29
Update packages.lock.json
JunielKatarn Jun 21, 2022
61733dc
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jun 22, 2022
a5e0d10
Update packages.lock.json
JunielKatarn Jun 23, 2022
d3bc919
Add Shared project to ReactUWPTestApp solution
JunielKatarn Jun 23, 2022
ad9bde5
RNTesterApp.csproj formatting
JunielKatarn Jun 23, 2022
1c3e84f
Enable Blob module in UWP
JunielKatarn Jun 23, 2022
61fcebc
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jun 23, 2022
b587e11
Change files
JunielKatarn Jun 23, 2022
e3351ad
Update packages.lock.json
JunielKatarn Jun 23, 2022
04a9135
Use context property bag for runtime options in MSRN
JunielKatarn Jun 24, 2022
c49f031
Remove unused options header
JunielKatarn Jun 24, 2022
8b68704
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jun 24, 2022
6b12d9d
Revert ReactUWPTestApp.sln
JunielKatarn Jun 24, 2022
f82a8be
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jun 24, 2022
db94f6c
Update packages.lock.json
JunielKatarn Jun 24, 2022
25545f9
Update packages.lock.json
JunielKatarn Jun 24, 2022
e82283f
Use namespace in monolith HTTP module property
JunielKatarn Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/e2e-test-app/windows/RNTesterApp/RNTesterApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CSharpApp.props" Condition="Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CSharpApp.props')" />
</ImportGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
Comment thread
JunielKatarn marked this conversation as resolved.
<Version>6.2.9</Version>
</PackageReference>
<PackageReference Include="XamlTreeDump">
Expand All @@ -165,4 +165,4 @@
<Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CSharpApp.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CSharpApp.props'))" />
<Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CSharpApp.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CSharpApp.targets'))" />
</Target>
</Project>
</Project>
66 changes: 59 additions & 7 deletions packages/e2e-test-app/windows/RNTesterApp/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,21 @@
},
"ReactNative.Hermes.Windows": {
"type": "Direct",
"requested": "[0.11.0-ms.6, )",
"resolved": "0.11.0-ms.6",
"contentHash": "7KGeDHh4QR4ua5+aSNAfuhj1sF2PBJbTHJ9m520xo1GZZRW4cxJlyNDNjW5t/sFGeHWw/Uhs7ZrWE2maL9BOEw=="
"requested": "[0.12.1, )",
"resolved": "0.12.1",
"contentHash": "0yjt0Y2pNfqw7qUiV5Q3W8hZ2HuS3HiS135c/ILLXeRXLpQMmfq1NS3oBZ1oMZy94gSfgP9QZ/862T3qUTES1A=="
},
"XamlTreeDump": {
"type": "Direct",
"requested": "[1.0.9, )",
"resolved": "1.0.9",
"contentHash": "rvh/RZghhSG28PDL1dw56nTZRN0/ViV2TIja/ykU9FHn0gtM8pwtgD8Ebo1nobu0QnSjn8Cg6Ncu39VV19rkrw=="
},
"boost": {
"type": "Transitive",
"resolved": "1.76.0",
"contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
},
"Microsoft.Net.Native.Compiler": {
"type": "Transitive",
"resolved": "2.2.7-rel-27913-00",
Expand All @@ -56,7 +61,17 @@
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "2.1.0",
"contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA=="
"contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ=="
},
"Microsoft.Windows.CppWinRT": {
"type": "Transitive",
"resolved": "2.0.211028.7",
"contentHash": "JBGI0c3WLoU6aYJRy9Qo0MLDQfObEp+d4nrhR95iyzf7+HOgjRunHDp/6eGFREd7xq3OI1mll9ecJrMfzBvlyg=="
},
"Microsoft.Windows.SDK.BuildTools": {
"type": "Transitive",
"resolved": "10.0.22000.194",
"contentHash": "4L0P3zqut466SIqT3VBeLTNUQTxCBDOrTRymRuROCRJKazcK7ibLz9yAO1nKWRt50ttCj39oAa2Iuz9ZTDmLlg=="
},
"NETStandard.Library": {
"type": "Transitive",
Expand Down Expand Up @@ -134,28 +149,65 @@
"contentHash": "qF6RRZKaflI+LR1YODNyWYjq5YoX8IJ2wx5y8O+AW2xO+1t/Q6Mm+jQ38zJbWnmXbrcOqUYofn7Y3/KC6lTLBQ=="
},
"automationchannel": {
"type": "Project",
"dependencies": {
"Microsoft.ReactNative": "1.0.0",
"Microsoft.UI.Xaml": "2.7.0",
"Microsoft.Windows.CppWinRT": "2.0.211028.7"
}
},
"common": {
"type": "Project"
},
"microsoft.reactnative": {
"fmt": {
"type": "Project"
},
"folly": {
"type": "Project",
"dependencies": {
"boost": "1.76.0",
"fmt": "1.0.0"
}
},
"microsoft.reactnative": {
"type": "Project",
"dependencies": {
"Common": "1.0.0",
"Folly": "1.0.0",
"Microsoft.UI.Xaml": "2.7.0",
"Microsoft.Windows.CppWinRT": "2.0.211028.7",
"Microsoft.Windows.SDK.BuildTools": "10.0.22000.194",
"ReactCommon": "1.0.0",
"ReactNative.Hermes.Windows": "0.12.1",
"boost": "1.76.0"
}
},
"microsoft.reactnative.managed": {
"type": "Project",
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9",
"Microsoft.ReactNative": "1.0.0"
}
},
"reactcommon": {
"type": "Project",
"dependencies": {
"Folly": "1.0.0",
"boost": "1.76.0"
}
},
"reactnativepicker": {
"type": "Project",
"dependencies": {
"Microsoft.ReactNative": "1.0.0"
"Microsoft.ReactNative": "1.0.0",
"Microsoft.UI.Xaml": "2.7.0"
}
},
"reactnativexaml": {
"type": "Project",
"dependencies": {
"Microsoft.ReactNative": "1.0.0"
"Microsoft.ReactNative": "1.0.0",
"Microsoft.UI.Xaml": "2.7.0"
}
}
},
Expand Down
54 changes: 29 additions & 25 deletions packages/e2e-test-app/windows/ReactUWPTestApp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29102.190
# Visual Studio Version 17
VisualStudioVersion = 17.2.32602.215
Comment thread
JunielKatarn marked this conversation as resolved.
Outdated
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\..\..\vnext\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
EndProject
Expand Down Expand Up @@ -42,20 +42,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactNativePicker", "..\..\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactNativeXaml", "..\..\..\node_modules\react-native-xaml\windows\ReactNativeXaml\ReactNativeXaml.vcxproj", "{0FF7027A-222C-4FFB-8F17-91D18BBAF7A8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\..\..\vnext\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}"
Comment thread
JunielKatarn marked this conversation as resolved.
Outdated
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\..\..\vnext\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
..\..\..\vnext\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
..\..\..\vnext\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM64 = Release|ARM64
Debug|ARM64 = Debug|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
Release|ARM64 = Release|ARM64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64
Expand All @@ -70,6 +66,20 @@ Global
{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
{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
{14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.Build.0 = Debug|x64
{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}.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
{14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.Build.0 = Release|x64
{14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.ActiveCfg = Release|Win32
{14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Build.0 = Release|Win32
{14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Deploy.0 = Release|Win32
{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
Expand Down Expand Up @@ -160,20 +170,6 @@ Global
{C0A69310-6119-46DC-A6D6-0BAB7826DC92}.Release|x64.Build.0 = Release|x64
{C0A69310-6119-46DC-A6D6-0BAB7826DC92}.Release|x86.ActiveCfg = Release|Win32
{C0A69310-6119-46DC-A6D6-0BAB7826DC92}.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
{14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.Build.0 = Debug|x64
{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}.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
{14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.Build.0 = Release|x64
{14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.ActiveCfg = Release|Win32
{14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Build.0 = Release|Win32
{14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Deploy.0 = Release|Win32
{BEDCC600-4541-41F2-AA46-9E058202B6AD}.Debug|ARM64.ActiveCfg = Debug|ARM64
{BEDCC600-4541-41F2-AA46-9E058202B6AD}.Debug|ARM64.Build.0 = Debug|ARM64
{BEDCC600-4541-41F2-AA46-9E058202B6AD}.Debug|x64.ActiveCfg = Debug|x64
Expand Down Expand Up @@ -204,14 +200,22 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3}
{14B93DC8-FD93-4A6D-81CB-8BC96644501C} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3}
{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3}
{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3}
{F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3}
{F2824844-CE15-4242-9420-308923CD76C3} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3}
{ADED4FBE-887D-4271-AF24-F0823BCE7961} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3}
{14B93DC8-FD93-4A6D-81CB-8BC96644501C} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3}
{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F5EAF3BA-6B6F-4E81-B5C6-49B30EC0A32E}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\..\..\vnext\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
..\..\..\vnext\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
..\..\..\vnext\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
..\..\..\vnext\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"NETStandard.Library": {
"type": "Transitive",
"resolved": "2.0.3",
"contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
"contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0"
}
Expand Down
14 changes: 14 additions & 0 deletions vnext/Microsoft.ReactNative/Base/CoreNativeModules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <Threading/MessageQueueThreadFactory.h>

// Shared
#include <CppRuntimeOptions.h>
#include <CreateModules.h>

namespace Microsoft::ReactNative {
Expand Down Expand Up @@ -50,11 +51,24 @@ std::vector<facebook::react::NativeModuleDescription> GetCoreModules(
[props = context->Properties()]() { return Microsoft::React::CreateHttpModule(props); },
jsMessageQueue);

if (!Microsoft::React::GetRuntimeOptionBool("Http.UseMonolithicModule")) {
Comment thread
JunielKatarn marked this conversation as resolved.
Outdated
modules.emplace_back(
Microsoft::React::GetBlobModuleName(),
[props = context->Properties()]() { return Microsoft::React::CreateBlobModule(props); },
jsMessageQueue);
Comment thread
JunielKatarn marked this conversation as resolved.
Outdated

modules.emplace_back(
Microsoft::React::GetFileReaderModuleName(),
[props = context->Properties()]() { return Microsoft::React::CreateFileReaderModule(props); },
jsMessageQueue);
}

modules.emplace_back(
"Timing",
[batchingUIMessageQueue]() { return facebook::react::CreateTimingModule(batchingUIMessageQueue); },
batchingUIMessageQueue);

// TODO: For reviewers - Why does this factory move the context object?
Comment thread
JunielKatarn marked this conversation as resolved.
Outdated
modules.emplace_back(
NativeAnimatedModule::name,
[context = std::move(context)]() mutable { return std::make_unique<NativeAnimatedModule>(std::move(context)); },
Expand Down
7 changes: 6 additions & 1 deletion vnext/Shared/OInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,13 +545,15 @@ std::vector<std::unique_ptr<NativeModule>> InstanceImpl::GetDefaultNativeModules
std::vector<std::unique_ptr<NativeModule>> modules;
auto transitionalProps{ReactPropertyBagHelper::CreatePropertyBag()};

#if (defined(_MSC_VER) && !defined(WINRT))
Comment thread
JunielKatarn marked this conversation as resolved.
modules.push_back(std::make_unique<CxxNativeModule>(
m_innerInstance,
Microsoft::React::GetHttpModuleName(),
[nativeQueue, transitionalProps]() -> std::unique_ptr<xplat::module::CxxModule> {
return Microsoft::React::CreateHttpModule(transitionalProps);
},
nativeQueue));
#endif

modules.push_back(std::make_unique<CxxNativeModule>(
m_innerInstance,
Expand Down Expand Up @@ -620,7 +622,9 @@ std::vector<std::unique_ptr<NativeModule>> InstanceImpl::GetDefaultNativeModules
nativeQueue));

// #10036 - Blob module not supported in UWP. Need to define property bag lifetime and onwership.
Comment thread
JunielKatarn marked this conversation as resolved.
Outdated
if (Microsoft::React::GetRuntimeOptionBool("Blob.EnableModule")) {
#if (defined(_MSC_VER) && !defined(WINRT))
if (Microsoft::React::GetRuntimeOptionBool("Blob.EnableModule") &&
!Microsoft::React::GetRuntimeOptionBool("Http.UseMonolithicModule")) {
modules.push_back(std::make_unique<CxxNativeModule>(
m_innerInstance,
Microsoft::React::GetBlobModuleName(),
Expand All @@ -633,6 +637,7 @@ std::vector<std::unique_ptr<NativeModule>> InstanceImpl::GetDefaultNativeModules
[transitionalProps]() { return Microsoft::React::CreateFileReaderModule(transitionalProps); },
nativeQueue));
}
#endif

return modules;
}
Expand Down