diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.cpp b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.cpp index 77feffa2506..d51eba6aa63 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.cpp +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.cpp @@ -19,6 +19,12 @@ App::App() noexcept { MainComponentName(L"SampleApp"); JavaScriptMainModuleName(L"index.windows"); +#ifdef BUNDLE + JavaScriptBundleFile(L"index.windows"); + InstanceSettings().UseWebDebugger(false); + InstanceSettings().UseLiveReload(false); +#endif + PackageProviders().Append(make()); // Includes all modules in this project PackageProviders().Append(winrt::SampleLibraryCPP::ReactPackageProvider()); PackageProviders().Append(winrt::SampleLibraryCS::ReactPackageProvider()); diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleApp.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleApp.vcxproj index 9def24981e1..17fb414775c 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleApp.vcxproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleApp.vcxproj @@ -24,6 +24,18 @@ + + DebugBundle + ARM + + + DebugBundle + Win32 + + + DebugBundle + x64 + Debug ARM @@ -36,6 +48,18 @@ Debug x64 + + ReleaseBundle + ARM + + + ReleaseBundle + Win32 + + + ReleaseBundle + x64 + Release ARM @@ -58,11 +82,20 @@ true true + + true + true + false true false + + false + true + false + @@ -99,11 +132,41 @@ _DEBUG;%(PreprocessorDefinitions) + + + _DEBUG;%(PreprocessorDefinitions) + + + cd $(SolutionDir).. +react-native bundle --platform windows --entry-file index.windows.js --bundle-output windows/SampleAppCpp/Bundle/index.windows.bundle --assets-dest windows/SampleAppCpp/Bundle + $(ProjectDir)Bundle\index.windows.bundle;%(Outputs) + $(SolutionDir)..\index.windows.js + true + + NDEBUG;%(PreprocessorDefinitions) + + + NDEBUG;BUNDLE;%(PreprocessorDefinitions) + + + cd $(SolutionDir).. +react-native bundle --platform windows --entry-file index.windows.js --bundle-output windows/SampleAppCpp/Bundle/index.windows.bundle --assets-dest windows/SampleAppCpp/Bundle + + + $(ProjectDir)Bundle\index.windows.bundle;%(Outputs) + + + $(SolutionDir)..\index.windows.js + + + true + + diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj index 35f1922551d..759e736c72a 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj @@ -115,6 +115,118 @@ PackageReference + + bin\x86\ReleaseBundle\ + TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + true + ;2008 + true + pdbonly + x86 + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\ARM\ReleaseBundle\ + TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + true + ;2008 + true + pdbonly + ARM + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\ARM64\ReleaseBundle\ + TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + true + ;2008 + true + pdbonly + ARM64 + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x64\ReleaseBundle\ + TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + true + ;2008 + true + pdbonly + x64 + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + + + true + bin\x86\DebugBundle\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + ;2008 + true + full + x86 + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + + + true + bin\ARM\DebugBundle\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + ;2008 + true + full + ARM + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + + + true + bin\ARM64\DebugBundle\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + ;2008 + true + full + ARM64 + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + + + true + bin\x64\DebugBundle\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + ;2008 + true + full + x64 + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + App.xaml diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln b/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln index b68bfa9c8f5..c1923b82df3 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln @@ -76,9 +76,15 @@ Global Debug|ARM = Debug|ARM Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + DebugBundle|ARM = DebugBundle|ARM + DebugBundle|x64 = DebugBundle|x64 + DebugBundle|x86 = DebugBundle|x86 Release|ARM = Release|ARM Release|x64 = Release|x64 Release|x86 = Release|x86 + ReleaseBundle|ARM = ReleaseBundle|ARM + ReleaseBundle|x64 = ReleaseBundle|x64 + ReleaseBundle|x86 = ReleaseBundle|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Debug|ARM.ActiveCfg = Debug|ARM @@ -90,6 +96,15 @@ Global {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Debug|x86.ActiveCfg = Debug|x86 {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Debug|x86.Build.0 = Debug|x86 {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Debug|x86.Deploy.0 = Debug|x86 + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.DebugBundle|ARM.ActiveCfg = DebugBundle|ARM + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.DebugBundle|ARM.Build.0 = DebugBundle|ARM + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.DebugBundle|ARM.Deploy.0 = DebugBundle|ARM + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.DebugBundle|x64.ActiveCfg = DebugBundle|x64 + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.DebugBundle|x64.Build.0 = DebugBundle|x64 + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.DebugBundle|x64.Deploy.0 = DebugBundle|x64 + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.DebugBundle|x86.ActiveCfg = DebugBundle|x86 + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.DebugBundle|x86.Build.0 = DebugBundle|x86 + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.DebugBundle|x86.Deploy.0 = DebugBundle|x86 {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|ARM.ActiveCfg = Release|ARM {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|ARM.Build.0 = Release|ARM {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|ARM.Deploy.0 = Release|ARM @@ -99,6 +114,15 @@ Global {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|x86.ActiveCfg = Release|x86 {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|x86.Build.0 = Release|x86 {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|x86.Deploy.0 = Release|x86 + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.ReleaseBundle|ARM.ActiveCfg = ReleaseBundle|ARM + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.ReleaseBundle|ARM.Build.0 = ReleaseBundle|ARM + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.ReleaseBundle|ARM.Deploy.0 = ReleaseBundle|ARM + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.ReleaseBundle|x64.Deploy.0 = ReleaseBundle|x64 + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.ReleaseBundle|x86.ActiveCfg = ReleaseBundle|x86 + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.ReleaseBundle|x86.Build.0 = ReleaseBundle|x86 + {09F4E6C1-2D12-4059-AA96-0B190861FD6A}.ReleaseBundle|x86.Deploy.0 = ReleaseBundle|x86 {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Debug|ARM.ActiveCfg = Debug|ARM {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Debug|ARM.Build.0 = Debug|ARM {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Debug|ARM.Deploy.0 = Debug|ARM @@ -108,6 +132,15 @@ Global {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Debug|x86.ActiveCfg = Debug|Win32 {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Debug|x86.Build.0 = Debug|Win32 {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Debug|x86.Deploy.0 = Debug|Win32 + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.DebugBundle|ARM.ActiveCfg = DebugBundle|ARM + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.DebugBundle|ARM.Build.0 = DebugBundle|ARM + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.DebugBundle|ARM.Deploy.0 = DebugBundle|ARM + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.DebugBundle|x64.ActiveCfg = DebugBundle|x64 + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.DebugBundle|x64.Build.0 = DebugBundle|x64 + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.DebugBundle|x64.Deploy.0 = DebugBundle|x64 + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.DebugBundle|x86.ActiveCfg = DebugBundle|Win32 + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.DebugBundle|x86.Build.0 = DebugBundle|Win32 + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.DebugBundle|x86.Deploy.0 = DebugBundle|Win32 {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Release|ARM.ActiveCfg = Release|ARM {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Release|ARM.Build.0 = Release|ARM {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Release|ARM.Deploy.0 = Release|ARM @@ -117,114 +150,231 @@ Global {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Release|x86.ActiveCfg = Release|Win32 {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Release|x86.Build.0 = Release|Win32 {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Release|x86.Deploy.0 = Release|Win32 + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.ReleaseBundle|ARM.ActiveCfg = ReleaseBundle|ARM + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.ReleaseBundle|ARM.Build.0 = ReleaseBundle|ARM + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.ReleaseBundle|ARM.Deploy.0 = ReleaseBundle|ARM + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.ReleaseBundle|x64.Deploy.0 = ReleaseBundle|x64 + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.ReleaseBundle|x86.ActiveCfg = ReleaseBundle|Win32 + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.ReleaseBundle|x86.Build.0 = ReleaseBundle|Win32 + {93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.ReleaseBundle|x86.Deploy.0 = ReleaseBundle|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.ActiveCfg = Debug|ARM {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.Build.0 = Debug|ARM {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}.DebugBundle|ARM.ActiveCfg = Debug|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.DebugBundle|ARM.Build.0 = Debug|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.DebugBundle|x64.ActiveCfg = Debug|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.DebugBundle|x64.Build.0 = Debug|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.DebugBundle|x86.ActiveCfg = Debug|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.DebugBundle|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|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 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.ReleaseBundle|ARM.ActiveCfg = ReleaseBundle|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.ReleaseBundle|ARM.Build.0 = ReleaseBundle|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.ReleaseBundle|x86.ActiveCfg = ReleaseBundle|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.ReleaseBundle|x86.Build.0 = ReleaseBundle|Win32 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|ARM.ActiveCfg = Debug|ARM {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|ARM.Build.0 = Debug|ARM {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x64.ActiveCfg = Debug|x64 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x64.Build.0 = Debug|x64 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x86.ActiveCfg = Debug|Win32 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x86.Build.0 = Debug|Win32 + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.DebugBundle|ARM.ActiveCfg = Debug|ARM + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.DebugBundle|ARM.Build.0 = Debug|ARM + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.DebugBundle|x64.ActiveCfg = Debug|x64 + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.DebugBundle|x64.Build.0 = Debug|x64 + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.DebugBundle|x86.ActiveCfg = Debug|Win32 + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.DebugBundle|x86.Build.0 = Debug|Win32 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|ARM.ActiveCfg = Release|ARM {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|ARM.Build.0 = Release|ARM {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x64.ActiveCfg = Release|x64 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x64.Build.0 = Release|x64 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x86.ActiveCfg = Release|Win32 {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x86.Build.0 = Release|Win32 + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.ReleaseBundle|ARM.ActiveCfg = ReleaseBundle|ARM + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.ReleaseBundle|ARM.Build.0 = ReleaseBundle|ARM + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.ReleaseBundle|x86.ActiveCfg = ReleaseBundle|Win32 + {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.ReleaseBundle|x86.Build.0 = ReleaseBundle|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|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}.DebugBundle|ARM.ActiveCfg = Debug|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.DebugBundle|ARM.Build.0 = Debug|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.DebugBundle|x64.ActiveCfg = Debug|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.DebugBundle|x64.Build.0 = Debug|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.DebugBundle|x86.ActiveCfg = Debug|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.DebugBundle|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|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 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.ReleaseBundle|ARM.ActiveCfg = ReleaseBundle|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.ReleaseBundle|ARM.Build.0 = ReleaseBundle|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.ReleaseBundle|x86.ActiveCfg = ReleaseBundle|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.ReleaseBundle|x86.Build.0 = ReleaseBundle|Win32 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32 + {11C084A3-A57C-4296-A679-CAC17B603144}.DebugBundle|ARM.ActiveCfg = Debug|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.DebugBundle|ARM.Build.0 = Debug|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.DebugBundle|x64.ActiveCfg = Debug|x64 + {11C084A3-A57C-4296-A679-CAC17B603144}.DebugBundle|x64.Build.0 = Debug|x64 + {11C084A3-A57C-4296-A679-CAC17B603144}.DebugBundle|x86.ActiveCfg = Debug|Win32 + {11C084A3-A57C-4296-A679-CAC17B603144}.DebugBundle|x86.Build.0 = Debug|Win32 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32 + {11C084A3-A57C-4296-A679-CAC17B603144}.ReleaseBundle|ARM.ActiveCfg = ReleaseBundle|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.ReleaseBundle|ARM.Build.0 = ReleaseBundle|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 + {11C084A3-A57C-4296-A679-CAC17B603144}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 + {11C084A3-A57C-4296-A679-CAC17B603144}.ReleaseBundle|x86.ActiveCfg = ReleaseBundle|Win32 + {11C084A3-A57C-4296-A679-CAC17B603144}.ReleaseBundle|x86.Build.0 = ReleaseBundle|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|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}.DebugBundle|ARM.ActiveCfg = Debug|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.DebugBundle|ARM.Build.0 = Debug|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.DebugBundle|x64.ActiveCfg = Debug|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.DebugBundle|x64.Build.0 = Debug|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.DebugBundle|x86.ActiveCfg = Debug|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.DebugBundle|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|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 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.ReleaseBundle|ARM.ActiveCfg = ReleaseBundle|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.ReleaseBundle|ARM.Build.0 = ReleaseBundle|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.ReleaseBundle|x86.ActiveCfg = ReleaseBundle|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.ReleaseBundle|x86.Build.0 = ReleaseBundle|Win32 {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Debug|ARM.ActiveCfg = Debug|ARM {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Debug|ARM.Build.0 = Debug|ARM {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Debug|x64.ActiveCfg = Debug|x64 {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Debug|x64.Build.0 = Debug|x64 {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Debug|x86.ActiveCfg = Debug|x86 {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Debug|x86.Build.0 = Debug|x86 + {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.DebugBundle|ARM.ActiveCfg = Debug|ARM + {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.DebugBundle|ARM.Build.0 = Debug|ARM + {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.DebugBundle|x64.ActiveCfg = Debug|x64 + {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.DebugBundle|x64.Build.0 = Debug|x64 + {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.DebugBundle|x86.ActiveCfg = Debug|x86 + {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.DebugBundle|x86.Build.0 = Debug|x86 {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Release|ARM.ActiveCfg = Release|ARM {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Release|ARM.Build.0 = Release|ARM {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Release|x64.ActiveCfg = Release|x64 {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Release|x64.Build.0 = Release|x64 {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Release|x86.ActiveCfg = Release|x86 {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Release|x86.Build.0 = Release|x86 + {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.ReleaseBundle|ARM.ActiveCfg = ReleaseBundle|ARM + {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.ReleaseBundle|ARM.Build.0 = ReleaseBundle|ARM + {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 + {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 + {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.ReleaseBundle|x86.ActiveCfg = ReleaseBundle|x86 + {C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.ReleaseBundle|x86.Build.0 = ReleaseBundle|x86 {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Debug|ARM.ActiveCfg = Debug|ARM {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Debug|ARM.Build.0 = Debug|ARM {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Debug|x64.ActiveCfg = Debug|x64 {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Debug|x64.Build.0 = Debug|x64 {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Debug|x86.ActiveCfg = Debug|Win32 {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Debug|x86.Build.0 = Debug|Win32 + {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.DebugBundle|ARM.ActiveCfg = Debug|ARM + {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.DebugBundle|ARM.Build.0 = Debug|ARM + {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.DebugBundle|x64.ActiveCfg = Debug|x64 + {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.DebugBundle|x64.Build.0 = Debug|x64 + {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.DebugBundle|x86.ActiveCfg = Debug|Win32 + {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.DebugBundle|x86.Build.0 = Debug|Win32 {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Release|ARM.ActiveCfg = Release|ARM {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Release|ARM.Build.0 = Release|ARM {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Release|x64.ActiveCfg = Release|x64 {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Release|x64.Build.0 = Release|x64 {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Release|x86.ActiveCfg = Release|Win32 {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Release|x86.Build.0 = Release|Win32 + {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.ReleaseBundle|ARM.ActiveCfg = ReleaseBundle|ARM + {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.ReleaseBundle|ARM.Build.0 = ReleaseBundle|ARM + {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 + {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 + {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.ReleaseBundle|x86.ActiveCfg = ReleaseBundle|Win32 + {47EEC7F3-40D3-49BA-82C1-EAF103B54215}.ReleaseBundle|x86.Build.0 = ReleaseBundle|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.ActiveCfg = Debug|ARM {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.Build.0 = Debug|ARM {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.ActiveCfg = Debug|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.Build.0 = Debug|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.ActiveCfg = Debug|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.Build.0 = Debug|Win32 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.DebugBundle|ARM.ActiveCfg = Debug|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.DebugBundle|ARM.Build.0 = Debug|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.DebugBundle|x64.ActiveCfg = Debug|x64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.DebugBundle|x64.Build.0 = Debug|x64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.DebugBundle|x86.ActiveCfg = Debug|Win32 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.DebugBundle|x86.Build.0 = Debug|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.ActiveCfg = Release|ARM {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.Build.0 = Release|ARM {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.ActiveCfg = Release|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.Build.0 = Release|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.ActiveCfg = Release|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.Build.0 = Release|Win32 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.ReleaseBundle|ARM.ActiveCfg = ReleaseBundle|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.ReleaseBundle|ARM.Build.0 = ReleaseBundle|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.ReleaseBundle|x86.ActiveCfg = ReleaseBundle|Win32 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.ReleaseBundle|x86.Build.0 = ReleaseBundle|Win32 {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|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}.DebugBundle|ARM.ActiveCfg = DebugBundle|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.DebugBundle|ARM.Build.0 = DebugBundle|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.DebugBundle|x64.ActiveCfg = Debug|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.DebugBundle|x64.Build.0 = Debug|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.DebugBundle|x86.ActiveCfg = Debug|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.DebugBundle|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|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 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.ReleaseBundle|ARM.ActiveCfg = ReleaseBundle|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.ReleaseBundle|ARM.Build.0 = ReleaseBundle|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.ReleaseBundle|x64.ActiveCfg = ReleaseBundle|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.ReleaseBundle|x64.Build.0 = ReleaseBundle|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.ReleaseBundle|x86.ActiveCfg = ReleaseBundle|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.ReleaseBundle|x86.Build.0 = ReleaseBundle|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj index 808b016e66d..0716ff0b100 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj @@ -18,6 +18,18 @@ + + DebugBundle + ARM + + + DebugBundle + Win32 + + + DebugBundle + x64 + Debug ARM @@ -30,6 +42,18 @@ Debug x64 + + ReleaseBundle + ARM + + + ReleaseBundle + Win32 + + + ReleaseBundle + x64 + Release ARM @@ -55,11 +79,20 @@ true true + + true + true + false true false + + false + true + false + @@ -98,11 +131,21 @@ _DEBUG;%(PreprocessorDefinitions) + + + _DEBUG;%(PreprocessorDefinitions) + + NDEBUG;%(PreprocessorDefinitions) + + + NDEBUG;%(PreprocessorDefinitions) + + diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCS/SampleLibraryCS.csproj b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCS/SampleLibraryCS.csproj index 5c25df5c4af..ea03490c55c 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCS/SampleLibraryCS.csproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCS/SampleLibraryCS.csproj @@ -82,6 +82,84 @@ PackageReference + + bin\x86\ReleaseBundle\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + true + pdbonly + x86 + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + + + bin\ARM\ReleaseBundle\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + true + pdbonly + ARM + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + + + bin\x64\ReleaseBundle\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + true + pdbonly + x64 + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x86\DebugBundle\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + true + full + x86 + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\ARM\DebugBundle\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + true + full + ARM + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x64\DebugBundle\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + true + full + x64 + false + 7.3 + prompt + MinimumRecommendedRules.ruleset + diff --git a/vnext/Common/Common.vcxproj b/vnext/Common/Common.vcxproj index 4fabcbeb074..9a5bc754f46 100644 --- a/vnext/Common/Common.vcxproj +++ b/vnext/Common/Common.vcxproj @@ -1,10 +1,34 @@ + + DebugBundle + ARM + + + DebugBundle + Win32 + + + DebugBundle + x64 + Debug x64 + + ReleaseBundle + ARM + + + ReleaseBundle + Win32 + + + ReleaseBundle + x64 + Release x64 @@ -78,11 +102,11 @@ - + - - + + diff --git a/vnext/Folly/Folly.vcxproj b/vnext/Folly/Folly.vcxproj index dde84c8ccf3..a2fd2277e2d 100644 --- a/vnext/Folly/Folly.vcxproj +++ b/vnext/Folly/Folly.vcxproj @@ -1,6 +1,18 @@  + + DebugBundle + ARM + + + DebugBundle + Win32 + + + DebugBundle + x64 + Debug ARM @@ -9,6 +21,18 @@ Debug x64 + + ReleaseBundle + ARM + + + ReleaseBundle + Win32 + + + ReleaseBundle + x64 + Release ARM @@ -274,7 +298,7 @@ - +