react-native-windows 0.68.0-preview.1 → 0.68.0-preview.2

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 (12) hide show
  1. package/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpApp.targets +9 -4
  2. package/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpLib.targets +5 -0
  3. package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppApp.SourceReferences.targets +18 -0
  4. package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppApp.targets +7 -8
  5. package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppLib.targets +5 -0
  6. package/PropertySheets/Generated/PackageVersion.g.props +1 -1
  7. package/PropertySheets/JSEngine.props +1 -1
  8. package/Scripts/rnw-dependencies.ps1 +1 -1
  9. package/package.json +5 -5
  10. package/template/cpp-app/proj/MyApp.vcxproj +0 -1
  11. package/template/cpp-lib/proj/MyLib.vcxproj +0 -1
  12. package/template/cs-app/proj/MyApp.csproj +0 -16
package/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpApp.targets CHANGED
@@ -10,6 +10,15 @@
10
10
  <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
11
11
  <Import Project="$(ReactNativeWindowsDir)PropertySheets\External\Microsoft.ReactNative.Common.targets" />
12
12
 
13
+ <!-- Due to visual studio unconditionally showing references, we have to trick it by making it impossible for VS to find the reference differences between building as source and building as NuGet -->
14
+ <Import Project="$(ReactNativeWindowsDir)PropertySheets\External\Microsoft.ReactNative.Uwp.CSharpApp.SourceReferences.targets"
15
+ Condition="!$(UseExperimentalNuget)" />
16
+
17
+ <ItemGroup>
18
+ <!-- WinUI package name and version are set by WinUI.props -->
19
+ <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" />
20
+ </ItemGroup>
21
+
13
22
  <Import Project="$(ReactNativeWindowsDir)PropertySheets\ManagedCodeGen\Microsoft.ReactNative.Managed.CodeGen.targets"
14
23
  Condition="'$(ReactNativeCodeGenEnabled)' == 'true' and '$(UseExperimentalNuget)' != 'true'" />
15
24
 
@@ -34,9 +43,5 @@
34
43
  ContinueOnError="false" />
35
44
  </Target>
36
45
 
37
- <!-- Due to visual studio unconditionally showing references, we have to trick it by making it impossible for VS to find the reference differences between building as source and building as NuGet -->
38
- <Import Project="$(ReactNativeWindowsDir)PropertySheets\External\Microsoft.ReactNative.Uwp.CSharpApp.SourceReferences.targets"
39
- Condition="!$(UseExperimentalNuget)" />
40
-
41
46
  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\RequireSolution.targets" />
42
47
  </Project>
package/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpLib.targets CHANGED
@@ -10,6 +10,11 @@
10
10
  <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
11
11
  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Common.targets" />
12
12
 
13
+ <ItemGroup>
14
+ <!-- WinUI package name and version are set by WinUI.props -->
15
+ <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" />
16
+ </ItemGroup>
17
+
13
18
  <ItemGroup>
14
19
  <ProjectReference Include="$(ReactNativeWindowsDir)\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj">
15
20
  <Project>{f7d32bd0-2749-483e-9a0d-1635ef7e3136}</Project>
package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppApp.SourceReferences.targets ADDED
@@ -0,0 +1,18 @@
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <!--
3
+ Copyright (c) Microsoft Corporation.
4
+ Licensed under the MIT License.
5
+ -->
6
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
7
+ <!-- To avoid having these references show in in Visual Studio which ignores conditions on items we have to put the source references in source. -->
8
+ <ImportGroup Label="Shared">
9
+ <Import Project="$(ReactNativeWindowsDir)\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems"
10
+ Label="Shared" />
11
+ </ImportGroup>
12
+ <ItemGroup>
13
+ <ProjectReference Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Microsoft.ReactNative.vcxproj">
14
+ <Project>{f7d32bd0-2749-483e-9a0d-1635ef7e3136}</Project>
15
+ <Name>Microsoft.ReactNative</Name>
16
+ </ProjectReference>
17
+ </ItemGroup>
18
+ </Project>
package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppApp.targets CHANGED
@@ -10,14 +10,13 @@
10
10
  <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
11
11
  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Common.targets" />
12
12
 
13
- <ImportGroup Condition="'$(UseExperimentalNuget)' == 'false'" Label="Shared">
14
- <Import Project="$(ReactNativeWindowsDir)\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems"
15
- Label="Shared" />
16
- </ImportGroup>
17
- <ItemGroup Condition="'$(UseExperimentalNuget)' == 'false'">
18
- <ProjectReference Include="$(ReactNativeWindowsDir)\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj">
19
- <Project>{f7d32bd0-2749-483e-9a0d-1635ef7e3136}</Project>
20
- </ProjectReference>
13
+ <!-- Due to visual studio unconditionally showing references, we have to trick it by making it impossible for VS to find the reference differences between building as source and building as NuGet -->
14
+ <Import Project="$(ReactNativeWindowsDir)PropertySheets\External\Microsoft.ReactNative.Uwp.CppApp.SourceReferences.targets"
15
+ Condition="!$(UseExperimentalNuget)" />
16
+
17
+ <ItemGroup>
18
+ <!-- WinUI package name and version are set by WinUI.props -->
19
+ <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" />
21
20
  </ItemGroup>
22
21
 
23
22
  <!-- The props file for bundling is not set up to be just defaults, it assumes to be run at the end of the project. -->
package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppLib.targets CHANGED
@@ -10,6 +10,11 @@
10
10
  <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
11
11
  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Common.targets" />
12
12
 
13
+ <ItemGroup>
14
+ <!-- WinUI package name and version are set by WinUI.props -->
15
+ <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" />
16
+ </ItemGroup>
17
+
13
18
  <ImportGroup Condition="'$(UseExperimentalNuget)' == 'false'" Label="Shared">
14
19
  <Import Project="$(ReactNativeWindowsDir)\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems" Label="Shared" />
15
20
  </ImportGroup>
package/PropertySheets/Generated/PackageVersion.g.props CHANGED
@@ -10,7 +10,7 @@
10
10
  -->
11
11
  <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
12
12
  <PropertyGroup>
13
- <ReactNativeWindowsVersion>0.68.0-preview.1</ReactNativeWindowsVersion>
13
+ <ReactNativeWindowsVersion>0.68.0-preview.2</ReactNativeWindowsVersion>
14
14
  <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
15
15
  <ReactNativeWindowsMinor>68</ReactNativeWindowsMinor>
16
16
  <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
package/PropertySheets/JSEngine.props CHANGED
@@ -8,7 +8,7 @@
8
8
  <!-- Enabling this will (1) Include hermes glues in the Microsoft.ReactNative binaries AND (2) Make hermes the default engine -->
9
9
  <UseHermes Condition="'$(UseHermes)' == ''">false</UseHermes>
10
10
  <!-- This will be true if (1) the client want to use hermes by setting UseHermes to true OR (2) We are building for UWP where dynamic switching is enabled -->
11
- <HermesVersion Condition="'$(HermesVersion)' == ''">0.10.0-ms.1</HermesVersion>
11
+ <HermesVersion Condition="'$(HermesVersion)' == ''">0.11.0-ms.2</HermesVersion>
12
12
  <HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgReactNative_Hermes_Windows)')">$(PkgReactNative_Hermes_Windows)</HermesPackage>
13
13
  <HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\ReactNative.Hermes.Windows\$(HermesVersion)</HermesPackage>
14
14
  <EnableHermesInspectorInReleaseFlavor Condition="'$(EnableHermesInspectorInReleaseFlavor)' == ''">false</EnableHermesInspectorInReleaseFlavor>
package/Scripts/rnw-dependencies.ps1 CHANGED
@@ -123,7 +123,7 @@ function InstallVS {
123
123
  function CheckNode {
124
124
  try {
125
125
  $v = (Get-Command node -ErrorAction Stop).Version.Major
126
- return ($v -ge 12) -and (($v % 2) -eq 0);
126
+ return ($v -ge 14) -and (($v % 2) -eq 0);
127
127
  } catch {
128
128
  return $false;
129
129
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-windows",
3
- "version": "0.68.0-preview.1",
3
+ "version": "0.68.0-preview.2",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",
@@ -26,8 +26,8 @@
26
26
  "@react-native-community/cli": "^7.0.1",
27
27
  "@react-native-community/cli-platform-android": "^7.0.1",
28
28
  "@react-native-community/cli-platform-ios": "^7.0.1",
29
- "@react-native-windows/cli": "0.68.0-preview.1",
30
- "@react-native-windows/virtualized-list": "0.68.0-preview.1",
29
+ "@react-native-windows/cli": "0.68.0-preview.2",
30
+ "@react-native-windows/virtualized-list": "0.68.0-preview.2",
31
31
  "@react-native/assets": "1.0.0",
32
32
  "@react-native/normalize-color": "2.0.0",
33
33
  "@react-native/polyfills": "2.0.0",
@@ -58,7 +58,7 @@
58
58
  "ws": "^6.1.4"
59
59
  },
60
60
  "devDependencies": {
61
- "@react-native-windows/codegen": "0.68.0-preview.1",
61
+ "@react-native-windows/codegen": "0.68.0-preview.2",
62
62
  "@rnw-scripts/eslint-config": "1.1.10",
63
63
  "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.0.4",
64
64
  "@rnx-kit/jest-preset": "^0.1.0",
@@ -139,6 +139,6 @@
139
139
  ],
140
140
  "promoteRelease": true,
141
141
  "engines": {
142
- "node": ">= 12.0.0"
142
+ "node": ">= 14"
143
143
  }
144
144
  }
package/template/cpp-app/proj/MyApp.vcxproj CHANGED
@@ -164,7 +164,6 @@
164
164
  {{#cppNugetPackages}}
165
165
  <PackageReference Include="{{ id }}" Version="{{ version }}" />
166
166
  {{/cppNugetPackages}}
167
- <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" />
168
167
  </ItemGroup>
169
168
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
170
169
  <ImportGroup Label="ReactNativeWindowsTargets">
package/template/cpp-lib/proj/MyLib.vcxproj CHANGED
@@ -136,7 +136,6 @@
136
136
  {{#cppNugetPackages}}
137
137
  <PackageReference Include="{{ id }}" Version="{{ version }}" />
138
138
  {{/cppNugetPackages}}
139
- <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" />
140
139
  </ItemGroup>
141
140
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
142
141
  <ImportGroup Label="ReactNativeWindowsTargets">
package/template/cs-app/proj/MyApp.csproj CHANGED
@@ -144,22 +144,6 @@
144
144
  <ImportGroup Label="ReactNativeWindowsPropertySheets">
145
145
  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CSharpApp.props" Condition="Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CSharpApp.props')" />
146
146
  </ImportGroup>
147
- <Choose>
148
- <When Condition="'$(UseWinUI3)'!='true'">
149
- <ItemGroup>
150
- <PackageReference Include="Microsoft.UI.Xaml" >
151
- <Version>$(WinUI2xVersion)</Version>
152
- </PackageReference>
153
- </ItemGroup>
154
- </When>
155
- <Otherwise>
156
- <ItemGroup>
157
- <PackageReference Include="Microsoft.WinUI">
158
- <Version>$(WinUI3Version)</Version>
159
- </PackageReference>
160
- </ItemGroup>
161
- </Otherwise>
162
- </Choose>
163
147
  <ItemGroup>
164
148
  {{#csNugetPackages}}
165
149
  <PackageReference Include="{{ id }}">