react-native-windows 0.74.19 → 0.74.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (24) hide show
  1. package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp +14 -32
  2. package/PropertySheets/External/Microsoft.ReactNative.Composition.Package.props +1 -0
  3. package/PropertySheets/External/Microsoft.ReactNative.Composition.Package.targets +4 -0
  4. package/PropertySheets/External/Microsoft.ReactNative.Cpp.PackageReferences.props +14 -4
  5. package/PropertySheets/Generated/PackageVersion.g.props +3 -3
  6. package/Scripts/Microsoft.ReactNative.VersionCheck.targets +2 -0
  7. package/package.json +2 -2
  8. package/template/cpp-app/proj/MyApp.sln +19 -19
  9. package/template/cpp-lib/proj/MyLib.sln +19 -19
  10. package/template/cs-app/proj/MyApp.sln +21 -21
  11. package/template/cs-lib/proj/MyLib.sln +21 -21
  12. package/template/metro.config.js +13 -2
  13. package/templates/cpp-app/NuGet_Config +13 -0
  14. package/templates/cpp-app/template.config.js +11 -1
  15. package/templates/cpp-app/windows/ExperimentalFeatures.props +1 -0
  16. package/templates/cpp-app/windows/MyApp.sln +29 -19
  17. package/templates/cpp-lib/NuGet_Config +13 -0
  18. package/templates/cpp-lib/example/NuGet_Config +6 -0
  19. package/templates/cpp-lib/template.config.js +11 -1
  20. package/templates/cpp-lib/windows/ExperimentalFeatures.props +1 -0
  21. package/templates/cpp-lib/windows/MyLib.sln +35 -25
  22. package/templates/old/generateWrapper.js +7 -4
  23. package/templates/templateUtils.js +3 -1
  24. package/template/metro.devMode.config.js +0 -56
package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp CHANGED
@@ -118,11 +118,6 @@ using namespace winrt::Microsoft::ReactNative;
118
118
 
119
119
  namespace Mso::React {
120
120
 
121
- std::string getApplicationTempFolder() {
122
- auto local = winrt::Windows::Storage::ApplicationData::Current().TemporaryFolder().Path();
123
- return Microsoft::Common::Unicode::Utf16ToUtf8(local.c_str(), local.size()) + "\\";
124
- }
125
-
126
121
  //=============================================================================================
127
122
  // LoadedCallbackGuard ensures that the OnReactInstanceLoaded is always called.
128
123
  // It calls OnReactInstanceLoaded in destructor with a cancellation error.
@@ -573,6 +568,15 @@ Mso::DispatchQueueSettings CreateDispatchQueueSettings(
573
568
  return queueSettings;
574
569
  }
575
570
 
571
+ std::unique_ptr<facebook::jsi::PreparedScriptStore> CreatePreparedScriptStore() noexcept {
572
+ std::unique_ptr<facebook::jsi::PreparedScriptStore> preparedScriptStore = nullptr;
573
+ wchar_t tempPath[MAX_PATH];
574
+ if (GetTempPathW(static_cast<DWORD>(std::size(tempPath)), tempPath)) {
575
+ preparedScriptStore = std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(winrt::to_string(tempPath));
576
+ }
577
+ return preparedScriptStore;
578
+ }
579
+
576
580
  #ifdef USE_FABRIC
577
581
  void ReactInstanceWin::InitializeBridgeless() noexcept {
578
582
  InitUIQueue();
@@ -640,7 +644,7 @@ void ReactInstanceWin::InitializeBridgeless() noexcept {
640
644
  }
641
645
 
642
646
  m_jsiRuntimeHolder = std::make_shared<Microsoft::ReactNative::HermesRuntimeHolder>(
643
- devSettings, m_jsMessageThread.Load(), CreateHermesPreparedScriptStore());
647
+ devSettings, m_jsMessageThread.Load(), CreatePreparedScriptStore());
644
648
  auto jsRuntime = std::make_unique<Microsoft::ReactNative::HermesJSRuntime>(m_jsiRuntimeHolder);
645
649
  jsRuntime->getRuntime();
646
650
  m_bridgelessReactInstance = std::make_unique<facebook::react::ReactInstance>(
@@ -657,7 +661,8 @@ void ReactInstanceWin::InitializeBridgeless() noexcept {
657
661
  facebook::react::ReactInstance::JSRuntimeFlags options;
658
662
  m_bridgelessReactInstance->initializeRuntime(options, [=](facebook::jsi::Runtime &runtime) {
659
663
  auto logger = [loggingHook = GetLoggingCallback()](const std::string &message, unsigned int logLevel) {
660
- loggingHook(static_cast<facebook::react::RCTLogLevel>(logLevel), message.c_str());
664
+ if (loggingHook)
665
+ loggingHook(static_cast<facebook::react::RCTLogLevel>(logLevel), message.c_str());
661
666
  };
662
667
  facebook::react::bindNativeLogger(runtime, logger);
663
668
 
@@ -713,19 +718,6 @@ void ReactInstanceWin::InitializeBridgeless() noexcept {
713
718
  }
714
719
  #endif
715
720
 
716
- std::unique_ptr<facebook::jsi::PreparedScriptStore> ReactInstanceWin::CreateHermesPreparedScriptStore() noexcept {
717
- std::unique_ptr<facebook::jsi::PreparedScriptStore> preparedScriptStore = nullptr;
718
- if (Microsoft::ReactNative::HasPackageIdentity()) {
719
- preparedScriptStore = std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(getApplicationTempFolder());
720
- } else {
721
- wchar_t tempPath[MAX_PATH];
722
- if (GetTempPathW(static_cast<DWORD>(std::size(tempPath)), tempPath)) {
723
- preparedScriptStore = std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(winrt::to_string(tempPath));
724
- }
725
- }
726
- return preparedScriptStore;
727
- }
728
-
729
721
  void ReactInstanceWin::FireInstanceCreatedCallback() noexcept {
730
722
  // The InstanceCreated event can be used to augment the JS environment for all JS code. So it needs to be
731
723
  // triggered before any platform JS code is run. Using m_jsMessageThread instead of jsDispatchQueue avoids
@@ -803,7 +795,7 @@ void ReactInstanceWin::InitializeWithBridge() noexcept {
803
795
  } else {
804
796
  switch (m_options.JsiEngine()) {
805
797
  case JSIEngine::Hermes: {
806
- preparedScriptStore = CreateHermesPreparedScriptStore();
798
+ preparedScriptStore = CreatePreparedScriptStore();
807
799
 
808
800
  auto hermesRuntimeHolder = std::make_shared<Microsoft::ReactNative::HermesRuntimeHolder>(
809
801
  devSettings, m_jsMessageThread.Load(), std::move(preparedScriptStore));
@@ -815,17 +807,7 @@ void ReactInstanceWin::InitializeWithBridge() noexcept {
815
807
  case JSIEngine::V8:
816
808
  #if defined(USE_V8)
817
809
  {
818
- if (Microsoft::ReactNative::HasPackageIdentity()) {
819
- preparedScriptStore =
820
- std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(getApplicationTempFolder());
821
- } else {
822
- wchar_t tempPath[MAX_PATH];
823
- if (GetTempPathW(static_cast<DWORD>(std::size(tempPath)), tempPath)) {
824
- preparedScriptStore =
825
- std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(winrt::to_string(tempPath));
826
- }
827
- }
828
-
810
+ preparedScriptStore = CreatePreparedScriptStore();
829
811
  bool enableMultiThreadSupport{false};
830
812
  #ifdef USE_FABRIC
831
813
  enableMultiThreadSupport = Microsoft::ReactNative::IsFabricEnabled(m_reactContext->Properties());
package/PropertySheets/External/Microsoft.ReactNative.Composition.Package.props CHANGED
@@ -11,4 +11,5 @@
11
11
  <Import Project="$(MSBuildThisFileDirectory)Microsoft.ReactNative.Common.props" />
12
12
  <!-- Fixes NuGet restore issues: -->
13
13
  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\NuGet.CSharp.props" />
14
+ <Import Project="$(ReactNativeWindowsDir)\PropertySheets\WinUI.props" />
14
15
  </Project>
package/PropertySheets/External/Microsoft.ReactNative.Composition.Package.targets CHANGED
@@ -14,5 +14,9 @@
14
14
  <!-- Needed for ucrtbased.dll when running a debug build. -->
15
15
  <SDKReference Include="Microsoft.VCLibs, Version=14.0" Condition="'$(Configuration)' == 'Debug'" />
16
16
  </ItemGroup>
17
+
18
+ <ItemGroup Condition="'$(UseExperimentalNuget)' == 'true'">
19
+ <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
20
+ </ItemGroup>
17
21
 
18
22
  </Project>
package/PropertySheets/External/Microsoft.ReactNative.Cpp.PackageReferences.props CHANGED
@@ -5,8 +5,18 @@
5
5
  -->
6
6
  <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
7
7
  <!-- Only include Microsoft.ReactNative.* NuGet packages that C++ (app and lib) projects need when using UseExperimentalNuget. -->
8
- <ItemGroup>
9
- <PackageReference Include="Microsoft.ReactNative" Version="$(ReactNativeWindowsVersion)" />
10
- <PackageReference Include="Microsoft.ReactNative.Cxx" Version="$(ReactNativeWindowsVersion)" />
11
- </ItemGroup>
8
+ <Choose>
9
+ <When Condition="'$(UseFabric)' == 'true'">
10
+ <ItemGroup>
11
+ <PackageReference Include="Microsoft.ReactNative" Version="$(ReactNativeWindowsVersion)-Fabric" />
12
+ <PackageReference Include="Microsoft.ReactNative.Cxx" Version="$(ReactNativeWindowsVersion)-Fabric" />
13
+ </ItemGroup>
14
+ </When>
15
+ <Otherwise>
16
+ <ItemGroup>
17
+ <PackageReference Include="Microsoft.ReactNative" Version="$(ReactNativeWindowsVersion)" />
18
+ <PackageReference Include="Microsoft.ReactNative.Cxx" Version="$(ReactNativeWindowsVersion)" />
19
+ </ItemGroup>
20
+ </Otherwise>
21
+ </Choose>
12
22
  </Project>
package/PropertySheets/Generated/PackageVersion.g.props CHANGED
@@ -10,11 +10,11 @@
10
10
  -->
11
11
  <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
12
12
  <PropertyGroup>
13
- <ReactNativeWindowsVersion>0.74.19</ReactNativeWindowsVersion>
13
+ <ReactNativeWindowsVersion>0.74.20</ReactNativeWindowsVersion>
14
14
  <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
15
15
  <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
16
- <ReactNativeWindowsPatch>19</ReactNativeWindowsPatch>
16
+ <ReactNativeWindowsPatch>20</ReactNativeWindowsPatch>
17
17
  <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
18
- <ReactNativeWindowsCommitId>003e7035d3c8e0fa14036ff257ca7916359f6b2c</ReactNativeWindowsCommitId>
18
+ <ReactNativeWindowsCommitId>845b736b4e6b6e814384ccb9389c7b0a1d549f4c</ReactNativeWindowsCommitId>
19
19
  </PropertyGroup>
20
20
  </Project>
package/Scripts/Microsoft.ReactNative.VersionCheck.targets CHANGED
@@ -66,6 +66,8 @@
66
66
 
67
67
  <PropertyGroup>
68
68
  <_ReactNativeWindowsVersionCheckNugetVersion>$$nuGetPackageVersion$$</_ReactNativeWindowsVersionCheckNugetVersion>
69
+ <!-- Strip out the -Fabric qualifier from the version string if present -->
70
+ <_ReactNativeWindowsVersionCheckNugetVersion>$(_ReactNativeWindowsVersionCheckNugetVersion.Replace('-Fabric', ''))</_ReactNativeWindowsVersionCheckNugetVersion>
69
71
  </PropertyGroup>
70
72
 
71
73
  <!-- Validate package.json file -->
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-windows",
3
- "version": "0.74.19",
3
+ "version": "0.74.20",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",
@@ -26,7 +26,7 @@
26
26
  "@react-native-community/cli": "13.6.9",
27
27
  "@react-native-community/cli-platform-android": "13.6.9",
28
28
  "@react-native-community/cli-platform-ios": "13.6.9",
29
- "@react-native-windows/cli": "0.74.3",
29
+ "@react-native-windows/cli": "0.74.4",
30
30
  "@react-native/assets": "1.0.0",
31
31
  "@react-native/assets-registry": "0.74.87",
32
32
  "@react-native/codegen": "0.74.87",
package/template/cpp-app/proj/MyApp.sln CHANGED
@@ -11,44 +11,44 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{{ name }}", "{{ name }}\{{
11
11
  {{/useExperimentalNuget}}
12
12
  EndProject
13
13
  {{^useExperimentalNuget}}
14
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\node_modules\react-native-windows\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
14
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\{{ rnwPathFromProjectRoot }}\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
15
15
  EndProject
16
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\node_modules\react-native-windows\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}"
16
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\{{ rnwPathFromProjectRoot }}\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}"
17
17
  EndProject
18
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\node_modules\react-native-windows\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
18
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\{{ rnwPathFromProjectRoot }}\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
19
19
  ProjectSection(ProjectDependencies) = postProject
20
20
  {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D}
21
21
  EndProjectSection
22
22
  EndProject
23
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\node_modules\react-native-windows\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}"
23
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}"
24
24
  EndProject
25
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\node_modules\react-native-windows\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}"
25
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}"
26
26
  EndProject
27
- 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}"
27
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}"
28
28
  EndProject
29
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\node_modules\react-native-windows\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}"
29
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\{{ rnwPathFromProjectRoot }}\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}"
30
30
  EndProject
31
31
  Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}"
32
32
  EndProject
33
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\node_modules\react-native-windows\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}"
33
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}"
34
34
  EndProject
35
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\node_modules\react-native-windows\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}"
35
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}"
36
36
  EndProject
37
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\node_modules\react-native-windows\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}"
37
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\{{ rnwPathFromProjectRoot }}\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}"
38
38
  EndProject
39
39
  {{/useExperimentalNuget}}
40
40
  Global
41
41
  {{^useExperimentalNuget}}
42
42
  GlobalSection(SharedMSBuildProjectFiles) = preSolution
43
- ..\node_modules\react-native-windows\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
44
- ..\node_modules\react-native-windows\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
45
- ..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
46
- ..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
47
- ..\node_modules\react-native-windows\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
48
- ..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
49
- ..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
50
- ..\node_modules\react-native-windows\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
51
- ..\node_modules\react-native-windows\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
43
+ ..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
44
+ ..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
45
+ ..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
46
+ ..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
47
+ ..\{{ rnwPathFromProjectRoot }}\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
48
+ ..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
49
+ ..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
50
+ ..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
51
+ ..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
52
52
  EndGlobalSection
53
53
  {{/useExperimentalNuget}}
54
54
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
package/template/cpp-lib/proj/MyLib.sln CHANGED
@@ -11,44 +11,44 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{{ name }}", "{{ name }}\{{
11
11
  {{/useExperimentalNuget}}
12
12
  EndProject
13
13
  {{^useExperimentalNuget}}
14
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\node_modules\react-native-windows\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
14
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\{{ rnwPathFromProjectRoot }}\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
15
15
  EndProject
16
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\node_modules\react-native-windows\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}"
16
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\{{ rnwPathFromProjectRoot }}\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}"
17
17
  EndProject
18
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\node_modules\react-native-windows\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
18
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\{{ rnwPathFromProjectRoot }}\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
19
19
  ProjectSection(ProjectDependencies) = postProject
20
20
  {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D}
21
21
  EndProjectSection
22
22
  EndProject
23
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\node_modules\react-native-windows\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}"
23
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}"
24
24
  EndProject
25
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\node_modules\react-native-windows\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}"
25
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}"
26
26
  EndProject
27
- 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}"
27
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}"
28
28
  EndProject
29
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\node_modules\react-native-windows\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}"
29
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\{{ rnwPathFromProjectRoot }}\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}"
30
30
  EndProject
31
31
  Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}"
32
32
  EndProject
33
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\node_modules\react-native-windows\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}"
33
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}"
34
34
  EndProject
35
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\node_modules\react-native-windows\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}"
35
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}"
36
36
  EndProject
37
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\node_modules\react-native-windows\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}"
37
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\{{ rnwPathFromProjectRoot }}\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}"
38
38
  EndProject
39
39
  {{/useExperimentalNuget}}
40
40
  Global
41
41
  {{^useExperimentalNuget}}
42
42
  GlobalSection(SharedMSBuildProjectFiles) = preSolution
43
- ..\node_modules\react-native-windows\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
44
- ..\node_modules\react-native-windows\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
45
- ..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
46
- ..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
47
- ..\node_modules\react-native-windows\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
48
- ..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
49
- ..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
50
- ..\node_modules\react-native-windows\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
51
- ..\node_modules\react-native-windows\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
43
+ ..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
44
+ ..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
45
+ ..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
46
+ ..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
47
+ ..\{{ rnwPathFromProjectRoot }}\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
48
+ ..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
49
+ ..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
50
+ ..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
51
+ ..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
52
52
  EndGlobalSection
53
53
  {{/useExperimentalNuget}}
54
54
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
package/template/cs-app/proj/MyApp.sln CHANGED
@@ -6,48 +6,48 @@ MinimumVisualStudioVersion = 10.0.40219.1
6
6
  Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "{{ name }}", "{{ name }}\{{ name }}.csproj", "{{ projectGuidUpper }}"
7
7
  EndProject
8
8
  {{^useExperimentalNuget}}
9
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\node_modules\react-native-windows\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
9
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\{{ rnwPathFromProjectRoot }}\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
10
10
  EndProject
11
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\node_modules\react-native-windows\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}"
11
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\{{ rnwPathFromProjectRoot }}\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}"
12
12
  EndProject
13
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\node_modules\react-native-windows\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
13
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\{{ rnwPathFromProjectRoot }}\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
14
14
  ProjectSection(ProjectDependencies) = postProject
15
15
  {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D}
16
16
  EndProjectSection
17
17
  EndProject
18
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\node_modules\react-native-windows\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}"
18
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}"
19
19
  EndProject
20
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\node_modules\react-native-windows\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}"
20
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}"
21
21
  EndProject
22
- 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}"
22
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}"
23
23
  EndProject
24
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\node_modules\react-native-windows\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}"
24
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\{{ rnwPathFromProjectRoot }}\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}"
25
25
  EndProject
26
26
  Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}"
27
27
  EndProject
28
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\node_modules\react-native-windows\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}"
28
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}"
29
29
  EndProject
30
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\node_modules\react-native-windows\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}"
30
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}"
31
31
  EndProject
32
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\node_modules\react-native-windows\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}"
32
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\{{ rnwPathFromProjectRoot }}\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}"
33
33
  EndProject
34
- 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}"
34
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ReactNative.Managed", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.csproj", "{F2824844-CE15-4242-9420-308923CD76C3}"
35
35
  EndProject
36
- Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ReactNative.Managed.CodeGen", "..\node_modules\react-native-windows\Microsoft.ReactNative.Managed.CodeGen\Microsoft.ReactNative.Managed.CodeGen.csproj", "{ADED4FBE-887D-4271-AF24-F0823BCE7961}"
36
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ReactNative.Managed.CodeGen", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Managed.CodeGen\Microsoft.ReactNative.Managed.CodeGen.csproj", "{ADED4FBE-887D-4271-AF24-F0823BCE7961}"
37
37
  EndProject
38
38
  {{/useExperimentalNuget}}
39
39
  Global
40
40
  {{^useExperimentalNuget}}
41
41
  GlobalSection(SharedMSBuildProjectFiles) = preSolution
42
- ..\node_modules\react-native-windows\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
43
- ..\node_modules\react-native-windows\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
44
- ..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
45
- ..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
46
- ..\node_modules\react-native-windows\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
47
- ..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
48
- ..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
49
- ..\node_modules\react-native-windows\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
50
- ..\node_modules\react-native-windows\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
42
+ ..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
43
+ ..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
44
+ ..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
45
+ ..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
46
+ ..\{{ rnwPathFromProjectRoot }}\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
47
+ ..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
48
+ ..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
49
+ ..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
50
+ ..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
51
51
  EndGlobalSection
52
52
  {{/useExperimentalNuget}}
53
53
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
package/template/cs-lib/proj/MyLib.sln CHANGED
@@ -6,48 +6,48 @@ MinimumVisualStudioVersion = 10.0.40219.1
6
6
  Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "{{ name }}", "{{ name }}\{{ name }}.csproj", "{{ projectGuidUpper }}"
7
7
  EndProject
8
8
  {{^useExperimentalNuget}}
9
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\node_modules\react-native-windows\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
9
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\{{ rnwPathFromProjectRoot }}\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
10
10
  EndProject
11
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\node_modules\react-native-windows\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}"
11
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\{{ rnwPathFromProjectRoot }}\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}"
12
12
  EndProject
13
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\node_modules\react-native-windows\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
13
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\{{ rnwPathFromProjectRoot }}\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
14
14
  ProjectSection(ProjectDependencies) = postProject
15
15
  {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D}
16
16
  EndProjectSection
17
17
  EndProject
18
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\node_modules\react-native-windows\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}"
18
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}"
19
19
  EndProject
20
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\node_modules\react-native-windows\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}"
20
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}"
21
21
  EndProject
22
- 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}"
22
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}"
23
23
  EndProject
24
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\node_modules\react-native-windows\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}"
24
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\{{ rnwPathFromProjectRoot }}\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}"
25
25
  EndProject
26
26
  Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}"
27
27
  EndProject
28
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\node_modules\react-native-windows\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}"
28
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}"
29
29
  EndProject
30
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\node_modules\react-native-windows\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}"
30
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}"
31
31
  EndProject
32
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\node_modules\react-native-windows\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}"
32
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\{{ rnwPathFromProjectRoot }}\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}"
33
33
  EndProject
34
- 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}"
34
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ReactNative.Managed", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.csproj", "{F2824844-CE15-4242-9420-308923CD76C3}"
35
35
  EndProject
36
- Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ReactNative.Managed.CodeGen", "..\node_modules\react-native-windows\Microsoft.ReactNative.Managed.CodeGen\Microsoft.ReactNative.Managed.CodeGen.csproj", "{ADED4FBE-887D-4271-AF24-F0823BCE7961}"
36
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ReactNative.Managed.CodeGen", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Managed.CodeGen\Microsoft.ReactNative.Managed.CodeGen.csproj", "{ADED4FBE-887D-4271-AF24-F0823BCE7961}"
37
37
  EndProject
38
38
  {{/useExperimentalNuget}}
39
39
  Global
40
40
  {{^useExperimentalNuget}}
41
41
  GlobalSection(SharedMSBuildProjectFiles) = preSolution
42
- ..\node_modules\react-native-windows\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
43
- ..\node_modules\react-native-windows\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
44
- ..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
45
- ..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
46
- ..\node_modules\react-native-windows\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
47
- ..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
48
- ..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
49
- ..\node_modules\react-native-windows\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
50
- ..\node_modules\react-native-windows\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
42
+ ..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
43
+ ..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
44
+ ..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
45
+ ..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
46
+ ..\{{ rnwPathFromProjectRoot }}\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
47
+ ..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
48
+ ..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
49
+ ..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
50
+ ..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
51
51
  EndGlobalSection
52
52
  {{/useExperimentalNuget}}
53
53
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
package/template/metro.config.js CHANGED
@@ -8,6 +8,11 @@ const rnwPath = fs.realpathSync(
8
8
  path.resolve(require.resolve('react-native-windows/package.json'), '..'),
9
9
  );
10
10
 
11
+ //{{#devMode}} [devMode
12
+ const rnwRootNodeModules = path.resolve(rnwPath, '..', 'node_modules');
13
+ const rnwPackages = path.resolve(rnwPath, '..', 'packages');
14
+ // devMode]{{/devMode}}
15
+
11
16
  /**
12
17
  * Metro configuration
13
18
  * https://facebook.github.io/metro/docs/configuration
@@ -16,6 +21,9 @@ const rnwPath = fs.realpathSync(
16
21
  */
17
22
 
18
23
  const config = {
24
+ //{{#devMode}} [devMode
25
+ watchFolders: [rnwPath, rnwRootNodeModules, rnwPackages],
26
+ // devMode]{{/devMode}}
19
27
  resolver: {
20
28
  blockList: exclusionList([
21
29
  // This stops "react-native run-windows" from causing the metro server to crash if its already running
@@ -27,6 +35,11 @@ const config = {
27
35
  new RegExp(`${rnwPath}/target/.*`),
28
36
  /.*\.ProjectImports\.zip/,
29
37
  ]),
38
+ //{{#devMode}} [devMode
39
+ extraNodeModules: {
40
+ 'react-native-windows': rnwPath,
41
+ },
42
+ // devMode]{{/devMode}}
30
43
  },
31
44
  transformer: {
32
45
  getTransformOptions: async () => ({
@@ -35,8 +48,6 @@ const config = {
35
48
  inlineRequires: true,
36
49
  },
37
50
  }),
38
- // This fixes the 'missing-asset-registry-path` error (see https://github.com/microsoft/react-native-windows/issues/11437)
39
- assetRegistryPath: 'react-native/Libraries/Image/AssetRegistry',
40
51
  },
41
52
  };
42
53
 
package/templates/cpp-app/NuGet_Config ADDED
@@ -0,0 +1,13 @@
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <configuration>
3
+ <packageSources>
4
+ <clear />
5
+ {{#addReactNativePublicAdoFeed}}
6
+ <add key="react-native" value="https://pkgs.dev.azure.com/ms/react-native/_packaging/react-native-public/nuget/v3/index.json" />
7
+ {{/addReactNativePublicAdoFeed}}
8
+ <add key="Nuget.org" value="https://api.nuget.org/v3/index.json" />
9
+ </packageSources>
10
+ <disabledPackageSources>
11
+ <clear />
12
+ </disabledPackageSources>
13
+ </configuration>
package/templates/cpp-app/template.config.js CHANGED
@@ -20,7 +20,11 @@ const templateUtils = require('../templateUtils');
20
20
  async function preInstall(config = {}, options = {}) {}
21
21
 
22
22
  async function getFileMappings(config = {}, options = {}) {
23
- const {rnwVersion, devMode} = templateUtils.getRnwInfo(config, options);
23
+ const projectRoot = config?.root ?? process.cwd();
24
+ const {rnwPath, rnwVersion, devMode, isCanary} = templateUtils.getRnwInfo(
25
+ config,
26
+ options,
27
+ );
24
28
 
25
29
  const projectName =
26
30
  config?.project?.windows?.project?.projectName ?? options?.name ?? 'MyApp';
@@ -48,6 +52,9 @@ async function getFileMappings(config = {}, options = {}) {
48
52
  namespaceCpp: namespaceCpp,
49
53
 
50
54
  rnwVersion: rnwVersion,
55
+ rnwPathFromProjectRoot: path
56
+ .relative(projectRoot, rnwPath)
57
+ .replace(/\//g, '\\'),
51
58
 
52
59
  mainComponentName,
53
60
 
@@ -64,6 +71,9 @@ async function getFileMappings(config = {}, options = {}) {
64
71
 
65
72
  devMode,
66
73
 
74
+ useNuGets: !devMode, // default is to use published NuGets except in devMode, change to true here if you want to test devMode and nugets simultaneously
75
+ addReactNativePublicAdoFeed: isCanary,
76
+
67
77
  cppNugetPackages,
68
78
  };
69
79
 
package/templates/cpp-app/windows/ExperimentalFeatures.props CHANGED
@@ -4,6 +4,7 @@
4
4
  <PropertyGroup Label="Microsoft.ReactNative Experimental Features">
5
5
  <UseFabric>true</UseFabric>
6
6
  <UseWinUI3>true</UseWinUI3>
7
+ <UseExperimentalNuget>{{useNuGets}}</UseExperimentalNuget>
7
8
 
8
9
  <ReactExperimentalFeaturesSet>true</ReactExperimentalFeaturesSet>
9
10
  </PropertyGroup>
package/templates/cpp-app/windows/MyApp.sln CHANGED
@@ -6,47 +6,53 @@ MinimumVisualStudioVersion = 10.0.40219.1
6
6
  Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "{{ name }}.Package", "{{ name }}.Package\{{ name }}.Package.wapproj", "{{ packageGuidUpper }}"
7
7
  EndProject
8
8
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{{ name }}", "{{ name }}\{{ name }}.vcxproj", "{{ projectGuidUpper }}"
9
+ {{^useNuGets}}
9
10
  ProjectSection(ProjectDependencies) = postProject
10
11
  {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136}
11
12
  EndProjectSection
13
+ {{/useNuGets}}
12
14
  EndProject
13
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\node_modules\react-native-windows\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
15
+ {{^useNuGets}}
16
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\{{ rnwPathFromProjectRoot }}\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
14
17
  EndProject
15
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\node_modules\react-native-windows\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}"
18
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\{{ rnwPathFromProjectRoot }}\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}"
16
19
  EndProject
17
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\node_modules\react-native-windows\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
20
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\{{ rnwPathFromProjectRoot }}\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
18
21
  ProjectSection(ProjectDependencies) = postProject
19
22
  {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D}
20
23
  EndProjectSection
21
24
  EndProject
22
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\node_modules\react-native-windows\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}"
25
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}"
23
26
  EndProject
24
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\node_modules\react-native-windows\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}"
27
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}"
25
28
  EndProject
26
- 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}"
29
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}"
27
30
  EndProject
28
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\node_modules\react-native-windows\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}"
31
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\{{ rnwPathFromProjectRoot }}\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}"
29
32
  EndProject
30
33
  Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}"
31
34
  EndProject
32
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\node_modules\react-native-windows\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}"
35
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}"
33
36
  EndProject
34
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\node_modules\react-native-windows\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}"
37
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}"
35
38
  EndProject
36
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\node_modules\react-native-windows\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}"
39
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\{{ rnwPathFromProjectRoot }}\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}"
37
40
  EndProject
41
+ {{/useNuGets}}
38
42
  Global
43
+ {{^useNuGets}}
39
44
  GlobalSection(SharedMSBuildProjectFiles) = preSolution
40
- ..\node_modules\react-native-windows\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
41
- ..\node_modules\react-native-windows\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
42
- ..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
43
- ..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
44
- ..\node_modules\react-native-windows\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
45
- ..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
46
- ..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
47
- ..\node_modules\react-native-windows\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
48
- ..\node_modules\react-native-windows\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
45
+ ..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
46
+ ..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
47
+ ..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
48
+ ..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
49
+ ..\{{ rnwPathFromProjectRoot }}\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
50
+ ..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
51
+ ..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
52
+ ..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
53
+ ..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
49
54
  EndGlobalSection
55
+ {{/useNuGets}}
50
56
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
51
57
  Debug|x64 = Debug|x64
52
58
  Debug|x86 = Debug|x86
@@ -92,6 +98,7 @@ Global
92
98
  {{ projectGuidUpper }}.Release|ARM64.ActiveCfg = Release|ARM64
93
99
  {{ projectGuidUpper }}.Release|ARM64.Build.0 = Release|ARM64
94
100
  {{ projectGuidUpper }}.Release|ARM64.Deploy.0 = Release|ARM64
101
+ {{^useNuGets}}
95
102
  {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64
96
103
  {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64
97
104
  {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64
@@ -154,10 +161,12 @@ Global
154
161
  {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.ActiveCfg = Release|Win32
155
162
  {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Build.0 = Release|Win32
156
163
  {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Deploy.0 = Release|Win32
164
+ {{/useNuGets}}
157
165
  EndGlobalSection
158
166
  GlobalSection(SolutionProperties) = preSolution
159
167
  HideSolutionNode = FALSE
160
168
  EndGlobalSection
169
+ {{^useNuGets}}
161
170
  GlobalSection(NestedProjects) = preSolution
162
171
  {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
163
172
  {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
@@ -170,6 +179,7 @@ Global
170
179
  {EF074BA1-2D54-4D49-A28E-5E040B47CD2E} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
171
180
  {14B93DC8-FD93-4A6D-81CB-8BC96644501C} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
172
181
  EndGlobalSection
182
+ {{/useNuGets}}
173
183
  GlobalSection(ExtensibilityGlobals) = postSolution
174
184
  SolutionGuid = {D43FAD39-F619-437D-BB40-04A3982ACB6A}
175
185
  EndGlobalSection
package/templates/cpp-lib/NuGet_Config ADDED
@@ -0,0 +1,13 @@
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <configuration>
3
+ <packageSources>
4
+ <clear />
5
+ {{#addReactNativePublicAdoFeed}}
6
+ <add key="react-native" value="https://pkgs.dev.azure.com/ms/react-native/_packaging/react-native-public/nuget/v3/index.json" />
7
+ {{/addReactNativePublicAdoFeed}}
8
+ <add key="Nuget.org" value="https://api.nuget.org/v3/index.json" />
9
+ </packageSources>
10
+ <disabledPackageSources>
11
+ <clear />
12
+ </disabledPackageSources>
13
+ </configuration>
package/templates/cpp-lib/example/NuGet_Config ADDED
@@ -0,0 +1,6 @@
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <configuration>
3
+ <!-- This placeholder file is reserved for future use, but also to prevent
4
+ using the config from the cpp-app template, allowing the lib to rely on
5
+ config file added to its root. -->
6
+ </configuration>
package/templates/cpp-lib/template.config.js CHANGED
@@ -75,7 +75,11 @@ async function getFileMappings(config = {}, options = {}) {
75
75
  options,
76
76
  );
77
77
 
78
- const {rnwVersion, devMode} = templateUtils.getRnwInfo(libConfig, libOptions);
78
+ const projectRoot = libConfig.root ?? process.cwd();
79
+ const {rnwPath, rnwVersion, devMode, isCanary} = templateUtils.getRnwInfo(
80
+ libConfig,
81
+ libOptions,
82
+ );
79
83
 
80
84
  const projectName =
81
85
  libConfig?.project?.windows?.projects[0]?.projectName ??
@@ -101,6 +105,9 @@ async function getFileMappings(config = {}, options = {}) {
101
105
  namespaceCpp: namespaceCpp,
102
106
 
103
107
  rnwVersion: rnwVersion,
108
+ rnwPathFromProjectRoot: path
109
+ .relative(projectRoot, rnwPath)
110
+ .replace(/\//g, '\\'),
104
111
 
105
112
  // Visual Studio is very picky about the casing of the guids for projects, project references and the solution
106
113
  // https://www.bing.com/search?q=visual+studio+project+guid+casing&cvid=311a5ad7f9fc41089507b24600d23ee7&FORM=ANAB01&PC=U531
@@ -112,6 +119,9 @@ async function getFileMappings(config = {}, options = {}) {
112
119
 
113
120
  devMode,
114
121
 
122
+ useNuGets: !devMode, // default is to use published NuGets except in devMode, change to true here if you want to test devMode and nugets simultaneously
123
+ addReactNativePublicAdoFeed: isCanary,
124
+
115
125
  cppNugetPackages,
116
126
  };
117
127
 
package/templates/cpp-lib/windows/ExperimentalFeatures.props CHANGED
@@ -4,6 +4,7 @@
4
4
  <PropertyGroup Label="Microsoft.ReactNative Experimental Features">
5
5
  <UseFabric>true</UseFabric>
6
6
  <UseWinUI3>true</UseWinUI3>
7
+ <UseExperimentalNuget>{{useNuGets}}</UseExperimentalNuget>
7
8
 
8
9
  <ReactExperimentalFeaturesSet>true</ReactExperimentalFeaturesSet>
9
10
  </PropertyGroup>
package/templates/cpp-lib/windows/MyLib.sln CHANGED
@@ -4,47 +4,53 @@ Microsoft Visual Studio Solution File, Format Version 12.00
4
4
  VisualStudioVersion = 17.3.32929.385
5
5
  MinimumVisualStudioVersion = 10.0.40219.1
6
6
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{{ name }}", "{{ name }}\{{ name }}.vcxproj", "{{ projectGuidUpper }}"
7
+ {{^useNuGets}}
7
8
  ProjectSection(ProjectDependencies) = postProject
8
9
  {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136}
9
10
  EndProjectSection
11
+ {{/useNuGets}}
10
12
  EndProject
11
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\node_modules\react-native-windows\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
13
+ {{^useNuGets}}
14
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\{{ rnwPathFromProjectRoot }}\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
12
15
  EndProject
13
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\node_modules\react-native-windows\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}"
16
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "..\{{ rnwPathFromProjectRoot }}\fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}"
14
17
  EndProject
15
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\node_modules\react-native-windows\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
18
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\{{ rnwPathFromProjectRoot }}\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
16
19
  ProjectSection(ProjectDependencies) = postProject
17
20
  {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D}
18
21
  EndProjectSection
19
22
  EndProject
20
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\node_modules\react-native-windows\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}"
23
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}"
21
24
  EndProject
22
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\node_modules\react-native-windows\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}"
25
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}"
23
26
  EndProject
24
- 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}"
27
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}"
25
28
  EndProject
26
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\node_modules\react-native-windows\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}"
29
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\{{ rnwPathFromProjectRoot }}\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}"
27
30
  EndProject
28
31
  Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}"
29
32
  EndProject
30
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\node_modules\react-native-windows\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}"
33
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}"
31
34
  EndProject
32
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\node_modules\react-native-windows\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}"
35
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}"
33
36
  EndProject
34
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\node_modules\react-native-windows\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}"
37
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\{{ rnwPathFromProjectRoot }}\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}"
35
38
  EndProject
39
+ {{/useNuGets}}
36
40
  Global
41
+ {{^useNuGets}}
37
42
  GlobalSection(SharedMSBuildProjectFiles) = preSolution
38
- ..\node_modules\react-native-windows\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
39
- ..\node_modules\react-native-windows\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
40
- ..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
41
- ..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
42
- ..\node_modules\react-native-windows\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
43
- ..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
44
- ..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
45
- ..\node_modules\react-native-windows\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
46
- ..\node_modules\react-native-windows\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
43
+ ..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
44
+ ..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
45
+ ..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
46
+ ..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
47
+ ..\{{ rnwPathFromProjectRoot }}\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
48
+ ..\{{ rnwPathFromProjectRoot }}\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
49
+ ..\{{ rnwPathFromProjectRoot }}\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
50
+ ..\{{ rnwPathFromProjectRoot }}\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
51
+ ..\{{ rnwPathFromProjectRoot }}\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
47
52
  EndGlobalSection
53
+ {{/useNuGets}}
48
54
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
49
55
  Debug|x64 = Debug|x64
50
56
  Debug|x86 = Debug|x86
@@ -54,24 +60,25 @@ Global
54
60
  Release|ARM64 = Release|ARM64
55
61
  EndGlobalSection
56
62
  GlobalSection(ProjectConfigurationPlatforms) = postSolution
57
- {{ projectGuidUpper }}.Debug|ARM64.ActiveCfg = Debug|ARM64
58
- {{ projectGuidUpper }}.Debug|ARM64.Build.0 = Debug|ARM64
59
- {{ projectGuidUpper }}.Debug|ARM64.Deploy.0 = Debug|ARM64
60
63
  {{ projectGuidUpper }}.Debug|x64.ActiveCfg = Debug|x64
61
64
  {{ projectGuidUpper }}.Debug|x64.Build.0 = Debug|x64
62
65
  {{ projectGuidUpper }}.Debug|x64.Deploy.0 = Debug|x64
63
66
  {{ projectGuidUpper }}.Debug|x86.ActiveCfg = Debug|Win32
64
67
  {{ projectGuidUpper }}.Debug|x86.Build.0 = Debug|Win32
65
68
  {{ projectGuidUpper }}.Debug|x86.Deploy.0 = Debug|Win32
66
- {{ projectGuidUpper }}.Release|ARM64.ActiveCfg = Release|ARM64
67
- {{ projectGuidUpper }}.Release|ARM64.Build.0 = Release|ARM64
68
- {{ projectGuidUpper }}.Release|ARM64.Deploy.0 = Release|ARM64
69
+ {{ projectGuidUpper }}.Debug|ARM64.ActiveCfg = Debug|ARM64
70
+ {{ projectGuidUpper }}.Debug|ARM64.Build.0 = Debug|ARM64
71
+ {{ projectGuidUpper }}.Debug|ARM64.Deploy.0 = Debug|ARM64
69
72
  {{ projectGuidUpper }}.Release|x64.ActiveCfg = Release|x64
70
73
  {{ projectGuidUpper }}.Release|x64.Build.0 = Release|x64
71
74
  {{ projectGuidUpper }}.Release|x64.Deploy.0 = Release|x64
72
75
  {{ projectGuidUpper }}.Release|x86.ActiveCfg = Release|Win32
73
76
  {{ projectGuidUpper }}.Release|x86.Build.0 = Release|Win32
74
77
  {{ projectGuidUpper }}.Release|x86.Deploy.0 = Release|Win32
78
+ {{ projectGuidUpper }}.Release|ARM64.ActiveCfg = Release|ARM64
79
+ {{ projectGuidUpper }}.Release|ARM64.Build.0 = Release|ARM64
80
+ {{ projectGuidUpper }}.Release|ARM64.Deploy.0 = Release|ARM64
81
+ {{^useNuGets}}
75
82
  {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64
76
83
  {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64
77
84
  {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64
@@ -134,10 +141,12 @@ Global
134
141
  {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.ActiveCfg = Release|Win32
135
142
  {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Build.0 = Release|Win32
136
143
  {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Deploy.0 = Release|Win32
144
+ {{/useNuGets}}
137
145
  EndGlobalSection
138
146
  GlobalSection(SolutionProperties) = preSolution
139
147
  HideSolutionNode = FALSE
140
148
  EndGlobalSection
149
+ {{^useNuGets}}
141
150
  GlobalSection(NestedProjects) = preSolution
142
151
  {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
143
152
  {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
@@ -150,6 +159,7 @@ Global
150
159
  {EF074BA1-2D54-4D49-A28E-5E040B47CD2E} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
151
160
  {14B93DC8-FD93-4A6D-81CB-8BC96644501C} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
152
161
  EndGlobalSection
162
+ {{/useNuGets}}
153
163
  GlobalSection(ExtensibilityGlobals) = postSolution
154
164
  SolutionGuid = {D43FAD39-F619-437D-BB40-04A3982ACB6A}
155
165
  EndGlobalSection
package/templates/old/generateWrapper.js CHANGED
@@ -7,6 +7,7 @@
7
7
  */
8
8
 
9
9
  const generateWindows = require('../../generate');
10
+ const templateUtils = require('../templateUtils');
10
11
 
11
12
  function makeGenerateWindowsWrapper(
12
13
  language = 'cpp',
@@ -33,15 +34,17 @@ function makeGenerateWindowsWrapper(
33
34
  const postInstall = async (config = {}, options = {}) => {
34
35
  const experimentalFeatures = config?.project?.windows?.experimentalFeatures;
35
36
 
37
+ const rnwInfo = templateUtils.getRnwInfo(config, options);
38
+
36
39
  const generateOptions = {
37
40
  overwrite: !!options.overwrite,
38
41
  language,
39
42
  projectType,
40
43
  experimentalNuGetDependency:
41
- experimentalFeatures?.UseExperimentalNuget ?? false,
42
- useWinUI3: experimentalFeatures?.UseWinUI3 ?? false,
43
- useHermes: experimentalFeatures?.UseHermes ?? true,
44
- useDevMode: false,
44
+ experimentalFeatures?.UseExperimentalNuget === 'true' ?? false,
45
+ useWinUI3: experimentalFeatures?.UseWinUI3 === 'true' ?? false,
46
+ useHermes: experimentalFeatures?.UseHermes === 'true' ?? true,
47
+ useDevMode: rnwInfo.devMode,
45
48
  verbose: !!options.logging,
46
49
  telemetry: !!options.telemetry,
47
50
  };
package/templates/templateUtils.js CHANGED
@@ -30,6 +30,8 @@ function getRnwInfo(config = {}, options = {}) {
30
30
 
31
31
  const devMode = existsSync(path.join(rnwPath, 'src-win'));
32
32
 
33
+ const isCanary = rnwVersion.includes('canary');
34
+
33
35
  if (options?.logging) {
34
36
  console.log(
35
37
  `Found react-native-windows@${rnwVersion} at ${rnwPath}${
@@ -38,7 +40,7 @@ function getRnwInfo(config = {}, options = {}) {
38
40
  );
39
41
  }
40
42
 
41
- return {rnwPath, rnwVersion, devMode};
43
+ return {rnwPath, rnwVersion, devMode, isCanary};
42
44
  }
43
45
 
44
46
  function getWindowsProjectConfig(root) {
package/template/metro.devMode.config.js DELETED
@@ -1,56 +0,0 @@
1
- const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config');
2
-
3
- const fs = require('fs');
4
- const path = require('path');
5
- const exclusionList = require('metro-config/src/defaults/exclusionList');
6
-
7
- const rnwPath = fs.realpathSync(
8
- path.resolve(require.resolve('react-native-windows/package.json'), '..'),
9
- );
10
-
11
- // [devMode
12
- const rnwRootNodeModules = path.resolve(rnwPath, '..', 'node_modules');
13
- const rnwPackages = path.resolve(rnwPath, '..', 'packages');
14
- // devMode]
15
-
16
- /**
17
- * Metro configuration
18
- * https://facebook.github.io/metro/docs/configuration
19
- *
20
- * @type {import('metro-config').MetroConfig}
21
- */
22
-
23
- const config = {
24
- // [devMode
25
- watchFolders: [rnwPath, rnwRootNodeModules, rnwPackages],
26
- // devMode]
27
- resolver: {
28
- blockList: exclusionList([
29
- // This stops "react-native run-windows" from causing the metro server to crash if its already running
30
- new RegExp(
31
- `${path.resolve(__dirname, 'windows').replace(/[/\\]/g, '/')}.*`,
32
- ),
33
- // This prevents "react-native run-windows" from hitting: EBUSY: resource busy or locked, open msbuild.ProjectImports.zip or other files produced by msbuild
34
- new RegExp(`${rnwPath}/build/.*`),
35
- new RegExp(`${rnwPath}/target/.*`),
36
- /.*\.ProjectImports\.zip/,
37
- ]),
38
- // [devMode
39
- extraNodeModules: {
40
- 'react-native-windows': rnwPath,
41
- },
42
- // devMode]
43
- },
44
- transformer: {
45
- getTransformOptions: async () => ({
46
- transform: {
47
- experimentalImportSupport: false,
48
- inlineRequires: true,
49
- },
50
- }),
51
- // This fixes the 'missing-asset-registry-path` error (see https://github.com/microsoft/react-native-windows/issues/11437)
52
- assetRegistryPath: 'react-native/Libraries/Image/AssetRegistry',
53
- },
54
- };
55
-
56
- module.exports = mergeConfig(getDefaultConfig(__dirname), config);