react-native-windows 0.0.0-canary.445 → 0.0.0-canary.446

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 (4) hide show
  1. package/Directory.Build.targets +15 -4
  2. package/PropertySheets/External/Microsoft.ReactNative.Common.targets +15 -4
  3. package/PropertySheets/Generated/PackageVersion.g.props +1 -1
  4. package/package.json +2 -2
package/Directory.Build.targets CHANGED
@@ -4,10 +4,21 @@
4
4
  <!-- This import will noop when customer code is built. This import is here to help building the bits in the react-native-windows repository. -->
5
5
  <Import Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../')))" Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
6
6
 
7
- <!--Allow implicitly restoring PackageReference dependencies in C++ projects using the Visual Studio IDE.-->
8
- <Target Name="BeforeResolveReferences" Condition="'$(BuildingInsideVisualStudio)' == 'true'">
9
- <MSBuild Projects="$(SolutionPath)" Targets="Restore" Properties="RestoreProjectStyle=PackageReference" />
10
- <MSBuild Projects="$(SolutionPath)" Targets="Restore" Properties="RestoreProjectStyle=PackagesConfig;RestorePackagesConfig=true" />
7
+ <!--Allow implicitly restoring NuGet dependencies in C++ projects using the Visual Studio IDE.-->
8
+ <Target Name="BeforeResolveReferences" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(MSBuildProjectExtension)' == '.vcxproj'">
9
+ <!--
10
+ Ensure restoring of PackageReference dependencies.
11
+ -->
12
+ <MSBuild Projects="$(MSBuildProjectFile)" Targets="Restore" Properties="RestoreProjectStyle=PackageReference" />
13
+
14
+ <!--
15
+ Ensure restoring of packages.config dependencies.
16
+
17
+ RestoreProjectStyle=PackagesConfig - Required to use the packages.config mechanism
18
+ RestorePackagesConfig=true - Required to use the packages.config mechanism
19
+ RestoreUseStaticGraphEvaluation=false - Override setting from Directory.Build.props
20
+ -->
21
+ <MSBuild Projects="$(MSBuildProjectFile)" Targets="Restore" Properties="RestoreProjectStyle=PackagesConfig;RestorePackagesConfig=true;RestoreUseStaticGraphEvaluation=false" />
11
22
  </Target>
12
23
 
13
24
  </Project>
package/PropertySheets/External/Microsoft.ReactNative.Common.targets CHANGED
@@ -14,10 +14,21 @@
14
14
  </Target>
15
15
 
16
16
  <!-- Should match entry in $(ReactNativeWindowsDir)vnext\Directory.Build.targets -->
17
- <!--Allow implicitly restoring PackageReference dependencies in C++ projects using the Visual Studio IDE.-->
18
- <Target Name="BeforeResolveReferences" Condition="'$(BuildingInsideVisualStudio)' == 'true'">
19
- <MSBuild Projects="$(SolutionPath)" Targets="Restore" Properties="RestoreProjectStyle=PackageReference" />
20
- <MSBuild Projects="$(SolutionPath)" Targets="Restore" Properties="RestoreProjectStyle=PackagesConfig;RestorePackagesConfig=true" />
17
+ <!--Allow implicitly restoring NuGet dependencies in C++ projects using the Visual Studio IDE.-->
18
+ <Target Name="BeforeResolveReferences" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(MSBuildProjectExtension)' == '.vcxproj'">
19
+ <!--
20
+ Ensure restoring of PackageReference dependencies.
21
+ -->
22
+ <MSBuild Projects="$(MSBuildProjectFile)" Targets="Restore" Properties="RestoreProjectStyle=PackageReference" />
23
+
24
+ <!--
25
+ Ensure restoring of packages.config dependencies.
26
+
27
+ RestoreProjectStyle=PackagesConfig - Required to use the packages.config mechanism
28
+ RestorePackagesConfig=true - Required to use the packages.config mechanism
29
+ RestoreUseStaticGraphEvaluation=false - Override setting from Microsoft.ReactNative.Common.props
30
+ -->
31
+ <MSBuild Projects="$(MSBuildProjectFile)" Targets="Restore" Properties="RestoreProjectStyle=PackagesConfig;RestorePackagesConfig=true;RestoreUseStaticGraphEvaluation=false" />
21
32
  </Target>
22
33
 
23
34
  </Project>
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.0.0-canary.445</ReactNativeWindowsVersion>
13
+ <ReactNativeWindowsVersion>0.0.0-canary.446</ReactNativeWindowsVersion>
14
14
  <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
15
15
  <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
16
16
  <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-windows",
3
- "version": "0.0.0-canary.445",
3
+ "version": "0.0.0-canary.446",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",
@@ -26,7 +26,7 @@
26
26
  "@react-native-community/cli": "^6.0.0",
27
27
  "@react-native-community/cli-platform-android": "^6.0.0",
28
28
  "@react-native-community/cli-platform-ios": "^6.0.0",
29
- "@react-native-windows/cli": "0.0.0-canary.110",
29
+ "@react-native-windows/cli": "0.0.0-canary.111",
30
30
  "@react-native-windows/virtualized-list": "0.0.0-canary.26",
31
31
  "@react-native/assets": "1.0.0",
32
32
  "@react-native/normalize-color": "2.0.0",