Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
208 commits
Select commit Hold shift + click to select a range
38de357
Implement PackageReferences form Folly
JunielKatarn Jul 7, 2021
3f31bc7
Set ResolveNuGetPackages to false
JunielKatarn Jul 7, 2021
1bac122
Remove Folly packages.config
JunielKatarn Jul 7, 2021
7466121
Move ReactCommon to PackageReference
JunielKatarn Jul 7, 2021
e728e3d
Migrated Desktop
JunielKatarn Jul 7, 2021
c6dc800
Migrate Desktop.DLL
JunielKatarn Jul 7, 2021
256890d
Clean Desktop.DLL
JunielKatarn Jul 7, 2021
9785dae
Migrate Desktop.ABITests
JunielKatarn Jul 7, 2021
2827453
Migrated React.Windows.Test
JunielKatarn Jul 7, 2021
77d4488
Migrated Desktop.Test.DLL
JunielKatarn Jul 7, 2021
65defd8
Migrated Desktop.UnitTests
JunielKatarn Jul 7, 2021
3767457
Migrated Desktop.IntegrationTests
JunielKatarn Jul 7, 2021
749ce8f
Migrated ReactCommon.UnitTests
JunielKatarn Jul 7, 2021
f985c82
Migrate Mso.UnitTests
JunielKatarn Jul 7, 2021
92c9011
Migrate Microsoft.ReactNative
JunielKatarn Jul 7, 2021
b02f9b8
Clean up packages.config references
JunielKatarn Jul 8, 2021
ef480e1
Change files
JunielKatarn Jul 8, 2021
ebdfae0
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 8, 2021
77cb4b4
Clean React.Cpp.props
JunielKatarn Jul 8, 2021
27c384d
Start-TestServers: Do not start Node WS server by default
JunielKatarn Jul 8, 2021
8c8b5cb
Use msbuild /t:restore in CI
JunielKatarn Jul 8, 2021
19216b2
Use matrix for plaf/config on Universal
JunielKatarn Jul 8, 2021
0a76e63
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 8, 2021
6bc8547
Sort Reunion SLN platforms
JunielKatarn Jul 8, 2021
0e1ca51
Use parameters plaf/config
JunielKatarn Jul 8, 2021
0e9ed90
Add native to AssetTargetFallback
JunielKatarn Jul 8, 2021
4392c69
Remove Microsoft.ReactNative.IntegrationTests\packages.config
JunielKatarn Jul 8, 2021
4702de6
Upgrade to Microsoft.Windows.CppWinRT 2.0.210708.4
JunielKatarn Jul 8, 2021
833ec37
Conditionally reference Hermes and V8
JunielKatarn Jul 9, 2021
1cac88c
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 9, 2021
32ff08e
Set AssetTargetFallback for ProjectReunion
JunielKatarn Jul 9, 2021
3dc669d
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 9, 2021
8bb278a
Add missing conditions for V8Jsi and SourceLink
JunielKatarn Jul 9, 2021
dc76c17
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 9, 2021
4bd58e7
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 9, 2021
3841826
Set ToolsVersion to Current
JunielKatarn Jul 10, 2021
cc3a2e8
Debugging change. Revert
JunielKatarn Jul 10, 2021
bf202d8
Revert
JunielKatarn Jul 11, 2021
3fd5a95
Revert
JunielKatarn Jul 11, 2021
78bae0d
Revert
JunielKatarn Jul 11, 2021
ab427d8
Set fixed NuGet GlobalPackagesFolder
JunielKatarn Jul 11, 2021
94fdcef
Set fixed NuGet GlobalPackagesFolder
JunielKatarn Jul 11, 2021
8fdc508
Use Pipelines variable to set NUGET_PACKAGES
JunielKatarn Jul 11, 2021
1626cb8
Try setting globalPkgFolder in the repo NuGet.Config
JunielKatarn Jul 11, 2021
d4b3151
Move Vars target to roon Directory.Build.targets
JunielKatarn Jul 11, 2021
5566224
Fix NuGetCommand typo
JunielKatarn Jul 11, 2021
d263c9a
Dont insert newline on MSBuild project files
JunielKatarn Jul 11, 2021
99da255
Refactor Playground projects
JunielKatarn Jul 11, 2021
5ca6703
Revert
JunielKatarn Jul 11, 2021
ca003b2
Remove packages.config from playground
JunielKatarn Jul 11, 2021
9753d3e
Revert "Set ToolsVersion to Current"
JunielKatarn Jul 11, 2021
3b7ac9a
Set cache path in repo root NuGet.config
JunielKatarn Jul 11, 2021
0f80fe8
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 11, 2021
a02c3e7
Fix Folly.vcxproj indentation
JunielKatarn Jul 11, 2021
07af898
Use Windows PowerShell for custom agent pool
JunielKatarn Jul 11, 2021
9ef1abf
Install NuGet
JunielKatarn Jul 11, 2021
887993b
Increase test timeout to 10 min
JunielKatarn Jul 11, 2021
83c4ab0
Migrate integrationtest.vcxproj
JunielKatarn Jul 11, 2021
c6064c3
Migrate NodeRpc
JunielKatarn Jul 11, 2021
155e118
Change files
JunielKatarn Jul 11, 2021
716eb7d
Set NUGET_PACKAGES in both Universal build and test jobs
JunielKatarn Jul 11, 2021
59f1c4a
Remove monitoring steps from Universal
JunielKatarn Jul 11, 2021
dc89edf
Migrate sample-apps
JunielKatarn Jul 11, 2021
9b9aa00
Update cpp templates
JunielKatarn Jul 12, 2021
f8289e4
Clear vnext/templates package.config references
JunielKatarn Jul 12, 2021
5f2f077
Remove most cli references to packages.config
JunielKatarn Jul 12, 2021
84202be
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 12, 2021
a3d411c
Revert timeout
JunielKatarn Jul 12, 2021
8fe709b
Use the correct CppWinRT version in the TS generator
JunielKatarn Jul 13, 2021
cf47667
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 13, 2021
63f5d1a
Set ResolveNuGetPackages to false in VC Lib template
JunielKatarn Jul 13, 2021
02bb0e9
Update Hermes version references
JunielKatarn Jul 13, 2021
ec9487a
Pass BuildWinUI3Properties to playground CI restore step
JunielKatarn Jul 13, 2021
4a3d01c
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 13, 2021
59e2d0f
Update vars
JunielKatarn Jul 13, 2021
af601c5
Remove WinUIPackageProps
JunielKatarn Jul 14, 2021
107f13a
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 14, 2021
99d1e2b
Remove interface CppNugetPackage.
JunielKatarn Jul 14, 2021
cfa58d0
Set missing TargetFrameworkMoniker instances
JunielKatarn Jul 15, 2021
781e882
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 15, 2021
482b047
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 16, 2021
e1700f3
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 16, 2021
1db8c76
Fix typo
JunielKatarn Jul 16, 2021
7836ec4
Re-insert missing TestBundle.targets import
JunielKatarn Jul 16, 2021
59d2896
Update projectConfig.test
JunielKatarn Jul 16, 2021
83e7a01
Remove commented props
JunielKatarn Jul 16, 2021
e29f325
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 16, 2021
20618bc
Conditionally set AssetTargetFallback and TargetFrameworkMoniker
JunielKatarn Jul 17, 2021
d73b7d6
Patch C# lib and app templates
JunielKatarn Jul 17, 2021
61850d9
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 17, 2021
51e0e78
Set AssetTargetFallback directly in C# projects
JunielKatarn Jul 17, 2021
7510a37
Remove redundant NuGetToolInstaller@0 instances
JunielKatarn Jul 17, 2021
af203a6
Merge branch 'pkgref-cpp' of github.com:jurocha-ms/react-native-windo…
JunielKatarn Jul 17, 2021
67e9a69
Change files
JunielKatarn Jul 17, 2021
dbdc48a
Make @rnw-cli dependentChangeType minor
JunielKatarn Jul 17, 2021
45ba52f
Make react-native-windows dependentChangeType minor
JunielKatarn Jul 17, 2021
3f492a6
Make @rnw-cli dependentChangeType none
JunielKatarn Jul 17, 2021
5bca403
Make react-native-windows dependentChangeType none
JunielKatarn Jul 17, 2021
fe782e8
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 19, 2021
f004514
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 19, 2021
65b91c6
Remove packages.config logic from autolink
JunielKatarn Jul 20, 2021
2805162
Remove unused formatter variable
JunielKatarn Jul 20, 2021
cec5d0c
Delete ensureXAMLDialect tests
JunielKatarn Jul 20, 2021
0a5c72d
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 20, 2021
f9c470d
Remove unused projectConfigWindows
JunielKatarn Jul 20, 2021
fc79827
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 21, 2021
d3a62b0
Remove xml-formatter dependency
JunielKatarn Jul 21, 2021
65d6f7e
Parameterize V8Version
JunielKatarn Jul 21, 2021
7ed3125
Empty
JunielKatarn Jul 22, 2021
986c152
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 22, 2021
0577c25
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 23, 2021
12997c9
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 23, 2021
cb3b269
Re-introduce ensureXAMLDialect - useWinUI3
JunielKatarn Jul 24, 2021
8c92d5f
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 24, 2021
a528038
Merge branch 'pkgref-cpp' of github.com:jurocha-ms/react-native-windo…
JunielKatarn Jul 24, 2021
1c45e60
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 30, 2021
7128af9
Define V8PackageName
JunielKatarn Jul 30, 2021
ce2727f
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Aug 1, 2021
e4c3ce0
Add conditional reference to V8Jsi in playground-win32
JunielKatarn Aug 1, 2021
8e12e98
Use $(WinUIPackageVersion)
JunielKatarn Aug 1, 2021
1989cf8
Empty
JunielKatarn Aug 1, 2021
6a06e6f
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Aug 2, 2021
46689e7
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Aug 4, 2021
08f20a9
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Aug 10, 2021
4756434
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Aug 11, 2021
880e4e2
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Aug 14, 2021
1cf2fe4
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Aug 21, 2021
45d12da
Use $(HermesVersion) property
JunielKatarn Aug 21, 2021
7ddf83f
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Aug 27, 2021
79397d1
Restore packages.config workflow for react-native-picer
JunielKatarn Aug 28, 2021
280f8db
Drop EOL indicator
JunielKatarn Aug 28, 2021
4b06e47
Update patch
JunielKatarn Aug 28, 2021
fe4155f
Revert patch
JunielKatarn Aug 28, 2021
806270d
Use npx patch-package
JunielKatarn Aug 28, 2021
82a798f
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Aug 30, 2021
79e1440
Add WinUI 2 as packages.config dep in picker
JunielKatarn Aug 31, 2021
b5fae78
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Sep 2, 2021
7635eb8
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Sep 2, 2021
37d7336
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Sep 7, 2021
134b0c8
Change files
JunielKatarn Sep 7, 2021
4e8e7c0
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Oct 19, 2021
5433e5b
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Oct 20, 2021
ca18754
Update autolink.test.ts
JunielKatarn Oct 23, 2021
b540062
Restore xml-formatter
JunielKatarn Oct 23, 2021
9f31028
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Oct 23, 2021
9bbb55a
Fix YML indentation
JunielKatarn Nov 6, 2021
281a663
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 6, 2021
6f7ddf1
Fix more YAML indentation
JunielKatarn Nov 6, 2021
3bd852b
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 6, 2021
8ff42fc
Unconditionally include Hermes NuGet
JunielKatarn Nov 6, 2021
9d25c63
yarn lint
JunielKatarn Nov 6, 2021
eb40427
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 9, 2021
1a93938
Reference Hermes in Desktop.DLL
JunielKatarn Nov 10, 2021
910270c
Use parameters for SampleApps plaf/config
JunielKatarn Nov 10, 2021
6b7aaa1
Revert Microsoft.Windows.CppWinRT to 2.0.210312.4
JunielKatarn Nov 10, 2021
011fedb
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 10, 2021
dfe9c87
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 13, 2021
29e4fa3
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 13, 2021
047c86d
Define shared output MSBuild props in root Directory.Build
JunielKatarn Nov 13, 2021
6d26510
Detect when ProjectName prop is set
JunielKatarn Nov 13, 2021
0581709
Upgrade to Microsoft.Windows.CppWinRT 2.0.211028.7
JunielKatarn Nov 13, 2021
6be7d99
Drop RestoreLockedMode from CI build
JunielKatarn Nov 13, 2021
ae98f4b
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 16, 2021
89ffe1d
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 17, 2021
48e1c96
Ensure ComputeXamlGeneratedCLOutputs is called early enough
JunielKatarn Nov 18, 2021
35eb7a6
Restore playground/packages.config
JunielKatarn Nov 18, 2021
60207ab
Undelete packages.config in playground-win32
JunielKatarn Nov 18, 2021
6aa4b8f
Playground: Restore packages.config directly for compatibility
JunielKatarn Nov 18, 2021
27cb262
Specify packages.config paths
JunielKatarn Nov 18, 2021
0a4ecc6
Disable RestoreLockedMode for Sample Apps
JunielKatarn Nov 18, 2021
8e94a57
Playground - add WinUI 3 package
JunielKatarn Nov 18, 2021
e538c43
Update E2E packages.config
JunielKatarn Nov 18, 2021
aaa3531
Set Root/Base int/out props under vnext if not done already (i.e. tes…
JunielKatarn Nov 18, 2021
fab1391
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 18, 2021
673c83e
Revert changes to equals-foo test
JunielKatarn Nov 19, 2021
0f27557
Sync autolink.test with main
JunielKatarn Nov 19, 2021
cedbf93
Format
JunielKatarn Nov 19, 2021
d1c61de
Format
JunielKatarn Nov 19, 2021
b3b1d55
Refresh autolink source
JunielKatarn Nov 20, 2021
abbb3fe
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 20, 2021
519dc53
Revert autolink changes
JunielKatarn Nov 20, 2021
47a23e2
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 22, 2021
8130455
Revert msbuildtools.ts
JunielKatarn Nov 22, 2021
cd7b4c2
Use Choose group for conditional PackageReference items
JunielKatarn Nov 22, 2021
41f85a4
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 22, 2021
7144b68
Use one PackageReference Choos per variable
JunielKatarn Nov 22, 2021
c2ac06d
Add missing <ItemGroup>
JunielKatarn Nov 22, 2021
6a1baac
Drop common,fmt,folly from managed packages lock
JunielKatarn Nov 23, 2021
1093bff
Enable RestoreForceEvaluate with RestoreLockedMode
JunielKatarn Nov 23, 2021
a9e9234
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 23, 2021
757b679
Update / trim Managed.UnitTests lock file
JunielKatarn Nov 23, 2021
64153df
Correct parameters.restoreForceEvaluate usage
JunielKatarn Nov 23, 2021
9e60c66
Update comments on ad-hoc NuGet restore tasks
JunielKatarn Nov 23, 2021
9107617
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 23, 2021
45d717d
Place NuGet packages in agent tmp folder
JunielKatarn Nov 23, 2021
2f19611
Update E2E nuget lock
JunielKatarn Nov 24, 2021
65d1a97
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 24, 2021
2f5af0c
Don't restore ReactNativeXaml/packages.config directly
JunielKatarn Nov 24, 2021
08f18c0
Define function restorePackageConfigs
JunielKatarn Nov 25, 2021
60692da
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Nov 29, 2021
77440ad
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Dec 3, 2021
51f0faa
Managed.UnitTests/packages.lock.json
JunielKatarn Dec 3, 2021
0cdacf8
Automatically locate packages.config items in Playground and E2E CI
JunielKatarn Dec 4, 2021
440ded9
Use Foreach-Object
JunielKatarn Dec 4, 2021
9d4c758
Pass the iterated packages.config instance
JunielKatarn Dec 4, 2021
7dd9244
Implement NuGet restore special logic
JunielKatarn Dec 4, 2021
1f23e1a
Add packages.config lookup for mixed NuGet dependencies
JunielKatarn Dec 4, 2021
7caf747
Remove hard-coded system.debug
JunielKatarn Dec 4, 2021
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
10 changes: 10 additions & 0 deletions .ado/jobs/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@ jobs:
feature: UseHermes
value: ${{ matrix.UseHermes }}

# NuGet ignores packages.config if it detects <PackageReference>.
# Use restore packages.config directly to keep compabitility with ReactNativePicker.
- pwsh: |
Get-ChildItem -Recurse -Path packages.config |`
Foreach-Object {`
NuGet.exe Restore -PackagesDirectory windows\packages $_`
}
workingDirectory: packages/e2e-test-app
displayName: Restore packages.config items

Comment thread
NickGerleman marked this conversation as resolved.
- template: ../templates/run-windows-with-certificates.yml
parameters:
buildEnvironment: ${{ parameters.BuildEnvironment }}
Expand Down
10 changes: 10 additions & 0 deletions .ado/jobs/playground.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,16 @@ jobs:
parameters:
certificateName: playgroundEncodedKey

# NuGet ignores packages.config if it detects <PackageReference>.
# Use restore packages.config directly to keep compabitility with ReactNativePicker.
Comment thread
JunielKatarn marked this conversation as resolved.
- pwsh: |
Get-ChildItem -Recurse -Path packages.config |`
Foreach-Object {`
NuGet.exe Restore -PackagesDirectory packages $_`
}
workingDirectory: packages/playground/windows
displayName: Restore packages.config items

- template: ../templates/msbuild-sln.yml
parameters:
solutionDir: packages/playground/windows
Expand Down
16 changes: 13 additions & 3 deletions .ado/jobs/universal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@
- ${{ if eq(config.BuildEnvironment, parameters.buildEnvironment) }}:
- ${{ each matrix in config.Matrix }}:
- job: UniversalBuild${{ matrix.BuildPlatform }}${{ matrix.BuildConfiguration }}
variables: [template: ../variables/windows.yml]
variables:
- template: ../variables/windows.yml
# Some tasks run on a different user (VssAdministrator) instead of the default user (AzDevOps).
# Keep NuGet cache independent from the user directory.
Comment thread
JunielKatarn marked this conversation as resolved.
- name: NUGET_PACKAGES
value: $(Agent.TempDirectory)/NuGetPackages
displayName: Universal Build ${{ matrix.Name }}
pool: ${{ parameters.AgentPool.Large }}
timeoutInMinutes: 60
Expand All @@ -71,7 +76,7 @@
solutionName: Microsoft.ReactNative.sln
buildPlatform: ${{ matrix.BuildPlatform }}
buildConfiguration: ${{ matrix.BuildConfiguration }}

- ${{ if eq(config.BuildEnvironment, 'Continuous') }}:
- template: ../templates/component-governance.yml

Expand Down Expand Up @@ -111,7 +116,12 @@
Mso.UnitTests\**

- job: UniversalTest${{ matrix.Name }}
variables: [template: ../variables/windows.yml]
variables:
- template: ../variables/windows.yml
# Some tasks run on a different user (VssAdministrator) instead of the default user (AzDevOps).
# Keep NuGet cache independent from the user directory.
- name: NUGET_PACKAGES
value: $(Agent.TempDirectory)/NuGetPackages
displayName: Universal Test ${{ matrix.Name }}
dependsOn:
- UniversalBuild${{ matrix.BuildPlatform }}${{ matrix.BuildConfiguration }}
Expand Down
2 changes: 2 additions & 0 deletions .ado/templates/msbuild-sln.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,13 @@ steps:
createLogFile: true
logFileVerbosity: detailed
msbuildArgs:
/restore
/p:PreferredToolArchitecture=${{parameters.preferredToolArchitecture}}
/p:PlatformToolset=${{parameters.platformToolset}}
/p:PublishToolDuringBuild=true
/p:EnableSourceLink=true
/p:RestoreLockedMode=true
Comment thread
JunielKatarn marked this conversation as resolved.
/p:RestoreForceEvaluate=true
/bl:$(BuildLogDirectory)\MsBuild.binlog
/flp1:errorsonly;logfile=$(BuildLogDirectory)\MsBuild.err
/flp2:warningsonly;logfile=$(BuildLogDirectory)\MsBuild.wrn
Expand Down
9 changes: 6 additions & 3 deletions .ado/templates/run-windows-with-certificates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ parameters:
- name: restoreLockedMode
type: boolean
default: true
- name: restoreForceEvaluate
type: boolean
default: true

steps:
- ${{ if eq(parameters.buildConfiguration, 'Debug') }}:
Expand All @@ -33,7 +36,7 @@ steps:
--no-launch
--logging
--buildLogDirectory ${{ parameters.buildLogDirectory }}
--msbuildprops RestoreLockedMode=${{ parameters.restoreLockedMode }}
--msbuildprops RestoreLockedMode=${{ parameters.restoreLockedMode }},RestoreForceEvaluate=${{ parameters.restoreForceEvaluate }}
${{ parameters.deployOption }}
displayName: run-windows (Debug)
workingDirectory: ${{ parameters.workingDirectory }}
Expand All @@ -46,7 +49,7 @@ steps:
--no-launch
--logging
--buildLogDirectory ${{ parameters.buildLogDirectory }}
--msbuildprops RestoreLockedMode=${{ parameters.restoreLockedMode }}
--msbuildprops RestoreLockedMode=${{ parameters.restoreLockedMode }},RestoreForceEvaluate=${{ parameters.restoreForceEvaluate }}
${{ parameters.deployOption }}
displayName: run-windows (Release) - PR
workingDirectory: ${{ parameters.workingDirectory }}
Expand All @@ -63,7 +66,7 @@ steps:
--no-launch
--logging
--buildLogDirectory ${{ parameters.buildLogDirectory }}
--msbuildprops RestoreLockedMode=${{ parameters.restoreLockedMode }},PackageCertificateKeyFile=$(Build.SourcesDirectory)\EncodedKey.pfx
--msbuildprops RestoreLockedMode=${{ parameters.restoreLockedMode }},RestoreForceEvaluate=${{ parameters.restoreForceEvaluate }},PackageCertificateKeyFile=$(Build.SourcesDirectory)\EncodedKey.pfx
${{ parameters.deployOption }}
displayName: run-windows (Release) - CI
workingDirectory: ${{ parameters.workingDirectory }}
Expand Down
3 changes: 2 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ indent_size = 4
end_of_line = crlf

# Xml project files
[*.{csproj}]
[*.{config,csproj,njsproj,props,targets,vcxitems,vcxproj,vcxproj.filters}]
Comment thread
JunielKatarn marked this conversation as resolved.
indent_size = 2
end_of_line = crlf
insert_final_newline = false

# Xml files
[*.{xml,stylecop,resx,ruleset}]
Expand Down
39 changes: 38 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,43 @@
-->
<PropertyGroup>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These being at the root of the repo means that none of these props will apply to RNW users, who consume the bits via NuGet or npm. This is dangerous, since it causes developers to get different behavior from users.

Do we need to use this props file?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do, so it applies to all projects in the repo and not only the ones under vnext.

These properties/definitions don't need to be applied to user's code. Consumers of RNW can decide whether they want to use PackageReference-style restore or not.

<ReactNativeWindowsDir>$(MSBuildThisFileDirectory)vnext\</ReactNativeWindowsDir>

<Platform Condition="'$(Platform)' == ''">x64</Platform>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>

<RootIntDir>$(ReactNativeWindowsDir)build</RootIntDir>
<RootOutDir>$(ReactNativeWindowsDir)target</RootOutDir>
<!-- Visual Studio forces using 'Win32' for the 'x86' platform. -->
<BaseIntDir Condition="'$(Platform)' == 'Win32'">$(RootIntDir)\x86\$(Configuration)</BaseIntDir>
<BaseIntDir Condition="'$(Platform)' != 'Win32'">$(RootIntDir)\$(Platform)\$(Configuration)</BaseIntDir>
<BaseOutDir Condition="'$(Platform)' == 'Win32'">$(RootOutDir)\x86\$(Configuration)</BaseOutDir>
<BaseOutDir Condition="'$(Platform)' != 'Win32'">$(RootOutDir)\$(Platform)\$(Configuration)</BaseOutDir>
Comment thread
NickGerleman marked this conversation as resolved.
</PropertyGroup>

</Project>
<PropertyGroup Label="NuGet">
<MSBuildProjectExtensionsPath Condition="'$(ProjectName)' != ''">$(RootIntDir)\ProjectExtensions\$(ProjectName)\</MSBuildProjectExtensionsPath>
<MSBuildProjectExtensionsPath Condition="'$(ProjectName)' == ''">$(RootIntDir)\ProjectExtensions\$(MSBuildProjectName)\</MSBuildProjectExtensionsPath>
Comment thread
JunielKatarn marked this conversation as resolved.
</PropertyGroup>

<PropertyGroup Label="NuGet" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">

<!-- https://github.com/NuGet/Home/issues/10511#issuecomment-778400668 -->
<AssetTargetFallback>$(AssetTargetFallback);native</AssetTargetFallback>

<!--
Avoid Visual Studio error message:
"The project '$(MSBuildProjectName)' ran into a problem during the last operation: The value of the
'TargetFrameworkMoniker' and 'NuGetTargetMoniker' properties in the '$(Configuration)|$(Platform)' configuration are both
empty. This configuration will not contribute to NuGet restore, which may result in restore and build errors. You may
need to reload the solution after fixing the problem."
-->
<TargetFrameworkMoniker>native,Version=v0.0</TargetFrameworkMoniker>
<!-- TODO: Keep? -->
<!-- <RuntimeIdentifiers Condition="'$(RuntimeIdentifiers)' == ''">win;win-x64;win-x86;win-arm64</RuntimeIdentifiers> -->
</PropertyGroup>

<ItemGroup Label="NuGet" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">
<ProjectCapability Include="PackageReferences" />
Comment thread
JunielKatarn marked this conversation as resolved.
</ItemGroup>

</Project>
110 changes: 103 additions & 7 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</ItemGroup>
</Target>

<!--
This target checks if Yarn install needs to run or not.
<!--
This target checks if Yarn install needs to run or not.
This is a common cause of failed builds for developers not used to running it after syncing...
This check does not run during design time build and in our CI validation runs (detected via AGENT_NAME).
-->
Expand All @@ -27,7 +27,7 @@
>

<Message Text="Checking if yarn is 'up to date' by running a 'dry-run' version of `yarn install` and checking the exit code" />
<Exec
<Exec
ContinueOnError="True"
Command="yarn install --offline --cache-folder $(IntDir)\JsUpToDateCheck\Cache"
WorkingDirectory="$(MSBuildThisFileDirectory)"
Expand All @@ -36,13 +36,13 @@
</Exec>

<!-- Fail the build if yarn needs to install packages. -->
<Error
<Error
Condition="'%(_YarnExitCode.Identity)' != '0'"
Text="Yarn packages are out of date. Please run `yarn install &amp;&amp; yarn build` in the root of the repo to ensure the generated files are up to date"
Text="Yarn packages are out of date. Please run `yarn install &amp;&amp; yarn build` in the root of the repo to ensure the generated files are up to date"
/>

<!--
Copy the yarn.lock file to prevent this task from running over and over again, and only rerun the check with yarn.lock or any package.json changes.
<!--
Copy the yarn.lock file to prevent this task from running over and over again, and only rerun the check with yarn.lock or any package.json changes.
This will likely miss a few corner cases with local changes to package.json but should catch the most important case after syncing
-->
<Copy
Expand All @@ -57,5 +57,101 @@

</Target>

<!-- For build debugging purposes. -->
Comment thread
JunielKatarn marked this conversation as resolved.
<Target Name="Vars">
Comment thread
JunielKatarn marked this conversation as resolved.
<Message Text="General" />
<Message Text="=> ApplicationType [$(ApplicationType)]" />
<Message Text="=> Configuration [$(Configuration)]" />
<Message Text="=> Platform [$(Platform)]" />
<Message Text="=> PlatformTarget [$(PlatformTarget)]" />
<Message Text="=> PlatformName [$(PlatformName)]" />
<Message Text="=> DefaultPlatformToolset [$(DefaultPlatformToolset)]" />
<Message Text="=> PlatformToolset [$(PlatformToolset)]" />
<Message Text="=> SolutionDir [$(SolutionDir)]" />
<Message Text="=> RootDir [$(RootDir)]" />
<Message Text="=> RootIntDir [$(RootIntDir)]" />
<Message Text="=> RootOutDir [$(RootOutDir)]" />
<Message Text="=> BaseIntDir [$(BaseIntDir)]" />
<Message Text="=> BaseOutDir [$(BaseOutDir)]" />
<Message Text="=> IntDir [$(IntDir)]" />
<Message Text="=> OutDir [$(OutDir)]" />
<Message Text="=> TargetDir [$(TargetDir)]" />
<Message Text="=> TargetPath [$(TargetPath)]" />
<Message Text="=> TLogLocation [$(TLogLocation)]" />
<Message Text="=> LastBuildUnsuccessful [$(LastBuildUnsuccessful)]" />
<Message Text="=> LastBuildState [$(LastBuildState)]" />
<Message Text="=> GeneratedFilesDir [$(GeneratedFilesDir)]" />
<Message Text="=> WinVer [$(WinVer)]" />
<Message Text="=> TargetFrameworkMoniker [$(TargetFrameworkMoniker)]" />

<Message Text="%0A" />
<Message Text="Microsoft.CppBuild.targets/MakeDirsForCl" />
<Message Text="=> PrecompiledHeaderOutputFile [@(CLCompile->Metadata('PrecompiledHeaderOutputFile')->DirectoryName()->Distinct())]" />
<Message Text="=> AssemblerListingLocation [@(CLCompile->Metadata('AssemblerListingLocation')->DirectoryName()->Distinct())]" />
<Message Text="=> ObjectFileName [@(CLCompile->Metadata('ObjectFileName')->DirectoryName()->Distinct())]" />
<Message Text="=> ProgramDataBaseFileName [@(CLCompile->Metadata('ProgramDataBaseFileName')->DirectoryName()->Distinct())]" />
<Message Text="=> XMLDocumentationFileName [@(CLCompile->Metadata('XMLDocumentationFileName')->DirectoryName()->Distinct())]" />
<Message Text="=> BrowseInformationFile [@(CLCompile->Metadata('BrowseInformationFile')->DirectoryName()->Distinct())]" />
<Message Text="=> PreprocessOutputPath [@(CLCompile->Metadata('PreprocessOutputPath')->DirectoryName()->Distinct())]" />
<Message Text="=> PreprocessorDefinitions [@(CLCompile->Metadata('PreprocessorDefinitions')->Distinct())]" />
<Message Text="=> ClDirsToMake [@(ClDirsToMake)]" />

<Message Text="%0A" />
<Message Text="=> UnmergedWinmdDirectory [$(UnmergedWinmdDirectory)]" />
<Message Text="=> MergedWinmdDirectory [$(MergedWinmdDirectory)]" />
<Message Text="=> FollyDir [$(FollyDir)]" />
<Message Text="=> ReactNativeWindowsDir [$(ReactNativeWindowsDir)]" />
<Message Text="=> ReactNativeDir [$(ReactNativeDir)]" />
<Message Text="=> YogaDir [$(YogaDir)]" />
<Message Text="=> ProjectHome [$(ProjectHome)]" />
<Message Text="=> UserRootDir [$(UserRootDir)]" />
<Message Text="=> MSBuildExtensionsPath [$(MSBuildExtensionsPath)]" />
<Message Text="=> MSBuildExtensionsPath32 [$(MSBuildExtensionsPath32)]" />
<Message Text="=> MSBuildExtensionsPath64 [$(MSBuildExtensionsPath64)]" />
<Message Text="=> VCTargetsPath [$(VCTargetsPath)]" />

<Message Text="%0A" />
<Message Text="JS Engine" />
<Message Text="=> PkgReactNative_Hermes_Windows [$(PkgReactNative_Hermes_Windows)]" />
<Message Text="=> EnableHermesInspectorInReleaseFlavor [$(EnableHermesInspectorInReleaseFlavor)]" />
<Message Text="=> UseHermes [$(UseHermes)]" />
<Message Text="=> UseFabric [$(UseFabric)]" />
<Message Text="=> HermesVersion [$(HermesVersion)]" />
<Message Text="=> HermesPackage [$(HermesPackage)]" />
<Message Text="=> HermesArch [$(HermesArch)]" />
<Message Text="=> UseFabric [$(UseFabric)]" />
<Message Text="=> UseV8 [$(UseV8)]" />
<Message Text="=> V8Package [$(V8Package)]" />
<Message Text="=> V8Version [$(V8Version)]" />
<Message Text="=> V8AppPlatform [$(V8AppPlatform)]" />

<Message Text="%0A" />
<Message Text="NuGet" />
<Message Text="=> AssetTargetFallback [$(AssetTargetFallback)]" />
<Message Text="=> IncludeFrameworkReferencesFromNuGet [$(IncludeFrameworkReferencesFromNuGet)]" />
<Message Text="=> NuGetPackageRoot [$(NuGetPackageRoot)]" />
<Message Text="=> NuGetPackagesDirectory [$(NuGetPackagesDirectory)]" />
<Message Text="=> NuGetRuntimeIdentifier [$(NuGetRuntimeIdentifier)]" />
<Message Text="=> ProjectLockFile [$(ProjectLockFile)]" />
<Message Text="=> IntermediateOutputPath [$(IntermediateOutputPath)]" />
<Message Text="=> NuGetTargetMoniker [$(NuGetTargetMoniker)]" />
<Message Text="=> TargetFramework [$(TargetFramework)]" />
<Message Text="=> TargetFrameworks [$(TargetFrameworks)]" />
<Message Text="=> TargetFrameworkIdentifier [$(TargetFrameworkIdentifier)]" />
<Message Text="=> BaseNuGetRuntimeIdentifier [$(BaseNuGetRuntimeIdentifier)]" />
<Message Text="=> NuGetRuntimeIdentifier [$(NuGetRuntimeIdentifier)]" />
<Message Text="=> TargetPlatformIdentifier [$(TargetPlatformIdentifier)]" />
<Message Text="=> MSBuildProjectExtensionsPath [$(MSBuildProjectExtensionsPath)]" />

<Message Text="%0A" />
<Message Text="WinUI" />
<Message Text="=> UseWinUI3 [$(UseWinUI3)]" />
<Message Text="=> WinUI3Version [$(WinUI3Version)]" />
<Message Text="=> WinUI2xVersion [$(WinUI2xVersion)]" />
<Message Text="=> WinUIPackageName [$(WinUIPackageName)]" />
<Message Text="=> WinUIPackageVersion [$(WinUIPackageVersion)]" />
<Message Text="=> IsWinUIAlpha [$(IsWinUIAlpha)]" />

</Target>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Use PackageReference in C++ projects",
"packageName": "@react-native-windows/automation-channel",
"email": "julio.rocha@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Use PackageReference for C++ dependencies",
"packageName": "@react-native-windows/cli",
"email": "julio.rocha@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Use PackageReference for C++ dependencies",
"packageName": "node-rnw-rpc",
"email": "julio.rocha@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Use PackageReference for NuGet Dependencies",
"packageName": "react-native-windows",
"email": "julio.rocha@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
</ItemGroup>
<ItemGroup>
<None Include="PropertySheet.props" />
<None Include="packages.config" />
<None Include="AutomationChannel.def" />
</ItemGroup>
<ItemGroup>
Expand Down
Loading