react-native-windows 0.69.0-preview.2 → 0.69.0-preview.3

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 (5) hide show
  1. package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems +2 -2
  2. package/PropertySheets/Generated/PackageVersion.g.props +1 -1
  3. package/Scripts/Tfs/Layout-MSRN-Headers.ps1 +9 -5
  4. package/package.json +1 -1
  5. package/template/cs-app-WinAppSDK/proj/NuGet.Config +3 -1
package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems CHANGED
@@ -13,7 +13,7 @@
13
13
  <TurboModule_SourcePath Condition="'$(TurboModule_SourcePath)' == '' AND '$(ReactNativeDir)' != ''">$(ReactNativeDir)\ReactCommon\react\nativemodule\core</TurboModule_SourcePath>
14
14
  <TurboModule_SourcePath Condition="'$(TurboModule_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\TurboModule.h')">$(MSBuildThisFileDirectory)</TurboModule_SourcePath>
15
15
  <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND '$(ReactNativeDir)' != ''">$(ReactNativeDir)\ReactCommon\react\bridging</Bridging_SourcePath>
16
- <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\TurboModule.h')">$(MSBuildThisFileDirectory)</Bridging_SourcePath>
16
+ <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\CallbackWrapper.h')">$(MSBuildThisFileDirectory)ReactCommon</Bridging_SourcePath>
17
17
  </PropertyGroup>
18
18
  <ItemDefinitionGroup>
19
19
  <ClCompile>
@@ -108,7 +108,7 @@
108
108
  <PrecompiledHeader>NotUsing</PrecompiledHeader>
109
109
  <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
110
110
  </ClCompile>
111
- <ClCompile Include="$(TurboModule_SourcePath)\..\..\bridging\LongLivedObject.cpp">
111
+ <ClCompile Include="$(Bridging_SourcePath)\LongLivedObject.cpp">
112
112
  <PrecompiledHeader>NotUsing</PrecompiledHeader>
113
113
  <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
114
114
  </ClCompile>
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.69.0-preview.2</ReactNativeWindowsVersion>
13
+ <ReactNativeWindowsVersion>0.69.0-preview.3</ReactNativeWindowsVersion>
14
14
  <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
15
15
  <ReactNativeWindowsMinor>69</ReactNativeWindowsMinor>
16
16
  <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
package/Scripts/Tfs/Layout-MSRN-Headers.ps1 CHANGED
@@ -5,19 +5,20 @@ param(
5
5
  [string] $SourceRoot = ($PSScriptRoot | Split-Path | Split-Path | Split-Path),
6
6
  [string] $TargetRoot = "$SourceRoot\vnext\target",
7
7
  [System.IO.DirectoryInfo] $ReactWindowsRoot = "$SourceRoot\vnext",
8
- [System.IO.DirectoryInfo] $ReactNativeRoot = "$SourceRoot\node_modules\react-native",
8
+ [System.IO.DirectoryInfo] $ReactNativeRoot = "$SourceRoot\node_modules\react-native",
9
+ [System.IO.DirectoryInfo] $ReactCommonOverrideRoot = "$ReactWindowsRoot\ReactCommon\TEMP_UntilReactCommonUpdate",
9
10
  [string[]] $Extensions = ('h', 'hpp')
10
11
  )
11
12
 
12
13
  Write-Host "Source root: [$SourceRoot]"
13
14
  Write-Host "Destination root: [$TargetRoot]"
14
15
  Write-Host "React Native root: [$ReactNativeRoot]"
16
+ Write-Host "ReactCommon Override root: [$ReactCommonOverrideRoot]"
15
17
 
16
18
  md -Force $TargetRoot
17
19
 
18
20
  $patterns = $Extensions| ForEach-Object {"*.$_"}
19
21
 
20
-
21
22
  # include headers
22
23
  Copy-Item -Force -Recurse -Path $ReactWindowsRoot\include -Destination $TargetRoot\inc
23
24
 
@@ -27,6 +28,9 @@ Copy-Item -Force -Recurse -Path $ReactWindowsRoot\Microsoft.ReactNative.Cxx -Des
27
28
  # Copy native module spec files
28
29
  Copy-Item -Force -Recurse -Path $ReactWindowsRoot\codegen -Destination $TargetRoot\inc
29
30
 
31
+ # Overwrite temporary ReactCommon files (since this script can runs on a different machine than where ReactCommon was built)
32
+ Copy-Item -Force -Recurse -Path $ReactCommonOverrideRoot\* -Destination $ReactNativeRoot\ReactCommon\
33
+
30
34
  # Microsoft.ReactNative.CXX project JSI files
31
35
  Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\decorator.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
32
36
  Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\instrumentation.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
@@ -36,11 +40,11 @@ Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\jsi-inl.h -Destinati
36
40
  Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\threadsafe.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
37
41
 
38
42
  # Microsoft.ReactNative.CXX project TurboModule files
39
- New-Item -ItemType Directory -Path $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon
43
+ New-Item -ItemType Directory -Path $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon -Force
40
44
  Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\callinvoker\ReactCommon\CallInvoker.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
41
- Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\bridging\LongLivedObject.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
42
45
  Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\bridging\CallbackWrapper.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
43
- Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\nativemodule\core\ReactCommon\LongLivedObject.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
46
+ Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\bridging\LongLivedObject.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
47
+ Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\bridging\LongLivedObject.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
44
48
  Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\nativemodule\core\ReactCommon\TurboModule.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
45
49
  Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\nativemodule\core\ReactCommon\TurboModule.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
46
50
  Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-windows",
3
- "version": "0.69.0-preview.2",
3
+ "version": "0.69.0-preview.3",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",
package/template/cs-app-WinAppSDK/proj/NuGet.Config CHANGED
@@ -8,8 +8,10 @@
8
8
  {{#nuGetTestFeed}}
9
9
  <add key="NuGetTestFeed" value="{{ nuGetTestFeed }}" />
10
10
  {{/nuGetTestFeed}}
11
- <add key="Nuget.org" value="https://api.nuget.org/v3/index.json" />
11
+ {{#nuGetADOFeed}}
12
12
  <add key="react-native" value="https://pkgs.dev.azure.com/ms/react-native/_packaging/react-native-public/nuget/v3/index.json" />
13
+ {{/nuGetADOFeed}}
14
+ <add key="Nuget.org" value="https://api.nuget.org/v3/index.json" />
13
15
  </packageSources>
14
16
  <disabledPackageSources>
15
17
  <clear />