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
18 changes: 9 additions & 9 deletions .ado/jobs/cli-init-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ parameters:
template: cpp-lib
configuration: Release
platform: x64
additionalRunArguments: --singleproc # --singleproc required to workaround issue #13599
additionalRunArguments:
useNuGet: true
- Name: FabricLibX86Debug
template: cpp-lib
configuration: Debug
platform: x86
additionalRunArguments: --singleproc # --singleproc required to workaround issue #13599
additionalRunArguments:
useNuGet: true
- Name: FabricLibArm64Release
template: cpp-lib
configuration: Release
platform: ARM64
additionalRunArguments: --no-deploy --singleproc # --singleproc required to workaround issue #13599
additionalRunArguments: --no-deploy
useNuGet: true
- BuildEnvironment: SecurePullRequest
Matrix:
Expand Down Expand Up @@ -107,37 +107,37 @@ parameters:
template: cpp-lib
configuration: Debug
platform: x64
additionalRunArguments: --singleproc # --singleproc required to workaround issue #13599
additionalRunArguments:
useNuGet: true
- Name: FabricLibX64Release
template: cpp-lib
configuration: Release
platform: x64
additionalRunArguments: --singleproc # --singleproc required to workaround issue #13599
additionalRunArguments:
useNuGet: true
- Name: FabricLibX86Debug
template: cpp-lib
configuration: Debug
platform: x86
additionalRunArguments: --singleproc # --singleproc required to workaround issue #13599
additionalRunArguments:
useNuGet: true
- Name: FabricLibX86Release
template: cpp-lib
configuration: Release
platform: x86
additionalRunArguments: --singleproc # --singleproc required to workaround issue #13599
additionalRunArguments:
useNuGet: true
- Name: FabricLibArm64Debug
template: cpp-lib
configuration: Debug
platform: ARM64
additionalRunArguments: --no-deploy --singleproc # --singleproc required to workaround issue #13599
additionalRunArguments: --no-deploy
useNuGet: true
- Name: FabricLibArm64Release
template: cpp-lib
configuration: Release
platform: ARM64
additionalRunArguments: --no-deploy --singleproc # --singleproc required to workaround issue #13599
additionalRunArguments: --no-deploy
useNuGet: true
jobs:
- ${{ each config in parameters.buildMatrix }}:
Expand Down
2 changes: 0 additions & 2 deletions .ado/jobs/playground.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,6 @@ jobs:
msbuildArgs:
/p:PackageCertificateKeyFile=$(Build.SourcesDirectory)\EncodedKey.pfx
/p:PackageCertificatePassword=${{ parameters.certificatePassword }}
${{if eq(matrix.SolutionFile, 'Playground-Composition.sln')}}:
parallelBuild: false # required to workaround issue #13599

- ${{if and(false, endsWith(matrix.Name, 'Universal'), eq(matrix.BuildConfiguration, 'Debug')) }}: # Disabled as debugging doesn't work,remove false after issue is resolved, see https://github.com/microsoft/react-native-windows/issues/13543
# Execute debug feature tests (skip this step for the Win32 Playground app and for release builds)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Try fixing the circular dependency error",
"packageName": "react-native-windows",
"email": "66076509+vineethkuttan@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
<WarningLevel>Level4</WarningLevel>
<SDLCheck>true</SDLCheck>
<AdditionalOptions>%(AdditionalOptions) /bigobj</AdditionalOptions>
<AdditionalOptions>%(AdditionalOptions) /bigobj /FS</AdditionalOptions>
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
</ClCompile>
<Link>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
<Warning Text="Property `RnwSdkDefaultsSet` was not set. Please ensure your project imports 'Microsoft.ReactNative.WindowsSdk.Default.props' before importing this prop sheet." />
</Target>

<!--
Lib/module projects generate Windows Metadata. Explicitly set this to
prevent the CppWinRT NuGet target CppWinRTComputeGetResolvedWinMD from
trying to compute it, which can cause MSB4006 circular dependency errors
during parallel builds (see https://github.com/microsoft/cppwinrt/issues/950).
-->
<PropertyGroup Label="CppWinRT">
<CppWinRTGenerateWindowsMetadata Condition="'$(CppWinRTGenerateWindowsMetadata)' == ''">true</CppWinRTGenerateWindowsMetadata>
</PropertyGroup>

<!-- Import common props sheets common to all Composition projects. -->
<Import Project="$(MSBuildThisFileDirectory)Microsoft.ReactNative.Composition.Common.props" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@
<Warning Text="Property `RnwSdkDefaultsSet` was not set. Please ensure your project imports 'Microsoft.ReactNative.WindowsSdk.Default.props' before importing this prop sheet." />
</Target>

<!--
Lib/module projects generate Windows Metadata. Explicitly set this to
prevent the CppWinRT NuGet target CppWinRTComputeGetResolvedWinMD from
trying to compute it, which can cause MSB4006 circular dependency errors
during parallel builds (see https://github.com/microsoft/cppwinrt/issues/950).
-->
<PropertyGroup Label="CppWinRT">
<CppWinRTGenerateWindowsMetadata Condition="'$(CppWinRTGenerateWindowsMetadata)' == ''">true</CppWinRTGenerateWindowsMetadata>
</PropertyGroup>

<!-- Import common props sheets common to all UWP projects. -->
<Import Project="$(MSBuildThisFileDirectory)Microsoft.ReactNative.Uwp.Common.props" />

Expand Down
2 changes: 2 additions & 0 deletions vnext/templates/cpp-app/windows/MyApp/MyApp.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<Import Project="$(SolutionDir)\ExperimentalFeatures.props" Condition="Exists('$(SolutionDir)\ExperimentalFeatures.props')" />
<PropertyGroup Label="Globals">
<CppWinRTOptimized>true</CppWinRTOptimized>
<!-- Prevent MSB4006 circular dependency in CppWinRT during parallel builds (https://github.com/microsoft/cppwinrt/issues/950) -->
<CppWinRTGenerateWindowsMetadata>false</CppWinRTGenerateWindowsMetadata>
<MinimalCoreWin>true</MinimalCoreWin>
<ProjectGuid>{{ projectGuidUpper }}</ProjectGuid>
<ProjectName>{{ name }}</ProjectName>
Expand Down
Loading