Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,11 @@ jobs:
- name: Determine whether the Windows app needs to be built
id: affected
uses: ./.github/actions/affected
- name: Restore NuGet packages
if: ${{ steps.affected.outputs.windows != '' }}
run: |
MSBuild -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }} -target:Restore
working-directory: packages/example-windows/windows
- name: Build
id: build
if: ${{ steps.affected.outputs.windows != '' }}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/lib-commonjs/utils/msbuildtools.js b/lib-commonjs/utils/msbuildtools.js
index a9304027f047b9e737a1de6e534aea1812704bd4..9f4ad135b6548506dde09e285afaa33852ee0988 100644
--- a/lib-commonjs/utils/msbuildtools.js
+++ b/lib-commonjs/utils/msbuildtools.js
@@ -105,10 +105,7 @@ class MSBuildTools {
if (enableParallelBuilds) {
args.push('/maxCpuCount');
}
- if (target === 'build') {
- args.push('/restore', '/p:RestorePackagesConfig=true');
- }
- else {
+ if (target !== 'build') {
args.push(`/t:Deploy`);
}
Object.keys(msBuildProps).forEach(key => {
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
"@nx/js/picomatch": "^4.0.4",
"@nx/workspace/picomatch": "^4.0.4",
"@react-native-windows/cli/@xmldom/xmldom": "^0.9.0",
"@react-native-windows/cli@npm:0.83.0": "patch:@react-native-windows/cli@npm%3A0.83.0#~/.yarn/patches/@react-native-windows-cli-npm-0.83.0-2d6aa101ac.patch",
"@react-native-windows/telemetry/@xmldom/xmldom": "^0.9.0",
"appium/ajv": "~8.18.0",
"appium/axios": "^1.15.0",
Expand Down
11 changes: 2 additions & 9 deletions packages/app/windows/Win32/ReactApp.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="Exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="ReactNativeWindowsPropertySheets">
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppApp.props" />
Expand Down Expand Up @@ -143,14 +143,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ReactNativeWindowsTargets">
<Import Project="$(ReactAppSharedDir)\EmbedManifest.targets" />
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppApp.targets" Condition="Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppApp.targets')" />
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppApp.targets" />
<!-- ReactTestApp additional targets -->
</ImportGroup>
<Target Name="EnsureReactNativeWindowsTargets" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references targets in your node_modules\react-native-windows folder. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppApp.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppApp.props'))" />
<Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppApp.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppApp.targets'))" />
</Target>
</Project>
31 changes: 31 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3510,6 +3510,37 @@ __metadata:
languageName: node
linkType: hard

"@react-native-windows/cli@patch:@react-native-windows/cli@npm%3A0.83.0#~/.yarn/patches/@react-native-windows-cli-npm-0.83.0-2d6aa101ac.patch":
version: 0.83.0
resolution: "@react-native-windows/cli@patch:@react-native-windows/cli@npm%3A0.83.0#~/.yarn/patches/@react-native-windows-cli-npm-0.83.0-2d6aa101ac.patch::version=0.83.0&hash=1cfcc6"
dependencies:
"@react-native-windows/codegen": "npm:0.83.0"
"@react-native-windows/fs": "npm:0.83.0"
"@react-native-windows/package-utils": "npm:0.83.0"
"@react-native-windows/telemetry": "npm:0.83.0"
"@xmldom/xmldom": "npm:^0.7.7"
chalk: "npm:^4.1.0"
cli-spinners: "npm:^2.2.0"
envinfo: "npm:^7.5.0"
execa: "npm:^5.0.0"
find-up: "npm:^4.1.0"
glob: "npm:^7.1.1"
lodash: "npm:^4.17.15"
mustache: "npm:^4.0.1"
ora: "npm:^3.4.0"
prompts: "npm:^2.4.1"
semver: "npm:^7.3.2"
shelljs: "npm:^0.8.4"
username: "npm:^5.1.0"
xml-formatter: "npm:^2.4.0"
xml-parser: "npm:^1.2.1"
xpath: "npm:^0.0.27"
peerDependencies:
react-native: "*"
checksum: 10c0/ce53b656464c47a18e04b06b6eeb3075da3d960f548787e8a44528c96ff334fa17ecc3ccd25160ea7b765aa4c82573f5de4a37ddefe36b709effe0ed43bf8210
languageName: node
linkType: hard

"@react-native-windows/codegen@npm:0.83.0":
version: 0.83.0
resolution: "@react-native-windows/codegen@npm:0.83.0"
Expand Down
Loading