Skip to content

Commit

Permalink
Update to Microsoft.NETCore.UniversalWindowsPlatform 6.2.14 (#14084)
Browse files Browse the repository at this point in the history
## Description

This PR upgrades the minimum version of `Microsoft.NETCore.UniversalWindowsPlatform` to 6.2.14 for UWP C# projects.

### Type of Change
- Bug fix (non-breaking change which fixes an issue)

### Why
This is long over-due as the latest (and probably last) version of this package hasn't changed in over two years. There's no reason for us to build against an older version. Just as importantly, this brings in a newer version of the .NetNative toolchain, which seems to resolve issues around C# builds hanging at the .NetNative step.

Resolves #14055
Resolves #9194
Resolves #4869

### What
Updated the minimum version of `Microsoft.NETCore.UniversalWindowsPlatform` to 6.2.14 for UWP C# projects. Added new entries to the props that enable C++ apps to consume C# modules to see the latest versions of .NetNative.

## Screenshots
N/A

## Testing
Verified E2Etests build and run.

## Changelog
Should this change be included in the release notes: _yes_

Update to Microsoft.NETCore.UniversalWindowsPlatform 6.2.14
  • Loading branch information
jonthysell authored Nov 5, 2024
1 parent b696ac8 commit 845aad2
Show file tree
Hide file tree
Showing 13 changed files with 895 additions and 880 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Update to the latest Microsoft.NETCore.UniversalWindowsPlatform",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
198 changes: 99 additions & 99 deletions packages/e2e-test-app/windows/RNTesterApp/packages.lock.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,18 @@
}
},
"common": {
"type": "Project"
"type": "Project",
"dependencies": {
"boost": "[1.83.0, )"
}
},
"fmt": {
"type": "Project"
},
"folly": {
"type": "Project",
"dependencies": {
"boost": "[1.83.0, )",
"fmt": "[1.0.0, )"
}
},
Expand All @@ -82,6 +86,7 @@
"playground-composition": {
"type": "Project",
"dependencies": {
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
"Microsoft.ReactNative": "[1.0.0, )",
"Microsoft.VCRTForwarders.140": "[1.0.2-rc, )",
"Microsoft.WindowsAppSDK": "[1.6.240923002, )",
Expand All @@ -92,7 +97,8 @@
"reactcommon": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )"
"Folly": "[1.0.0, )",
"boost": "[1.83.0, )"
}
},
"samplecustomcomponent": {
Expand Down
184 changes: 92 additions & 92 deletions packages/sample-apps/windows/SampleAppCPP/packages.lock.json

Large diffs are not rendered by default.

200 changes: 100 additions & 100 deletions packages/sample-apps/windows/SampleAppCS/packages.lock.json

Large diffs are not rendered by default.

198 changes: 99 additions & 99 deletions packages/sample-apps/windows/SampleLibraryCS/packages.lock.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

198 changes: 99 additions & 99 deletions vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json

Large diffs are not rendered by default.

196 changes: 98 additions & 98 deletions vnext/Microsoft.ReactNative.Managed/packages.lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions vnext/PropertySheets/CppAppConsumeCSharpModule.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<DotNetNativeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.Native.Compiler\2.2.10-rel-29722-00\build\Microsoft.Net.Native.Compiler.props')">2.2.10-rel-29722-00</DotNetNativeVersion>
<DotNetNativeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.Native.Compiler\2.2.11-rel-30601-02\build\Microsoft.Net.Native.Compiler.props')">2.2.11-rel-30601-02</DotNetNativeVersion>
<DotNetNativeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.Native.Compiler\2.2.12-rel-31116-00\build\Microsoft.Net.Native.Compiler.props')">2.2.12-rel-31116-00</DotNetNativeVersion>
<DotNetNativeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.Native.Compiler\2.2.12-rel-33220-00\build\Microsoft.Net.Native.Compiler.props')">2.2.12-rel-33220-00</DotNetNativeVersion>

<DotNetNativeRuntimeVersion>DOTNET_NATIVE_RUNTIME_VERSION_NOT_SET</DotNetNativeRuntimeVersion>
<DotNetNativeRuntimeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary\2.2.7-rel-27913-00\build\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary.props')">2.2.7-rel-27913-00</DotNetNativeRuntimeVersion>
Expand All @@ -28,6 +29,7 @@
<DotNetNativeRuntimeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary\2.2.8-rel-29722-00\build\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary.props')">2.2.8-rel-29722-00</DotNetNativeRuntimeVersion>
<DotNetNativeRuntimeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary\2.2.8-rel-30601-02\build\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary.props')">2.2.8-rel-30601-02</DotNetNativeRuntimeVersion>
<DotNetNativeRuntimeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary\2.2.8-rel-31116-00\build\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary.props')">2.2.8-rel-31116-00</DotNetNativeRuntimeVersion>
<DotNetNativeRuntimeVersion Condition="Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\UWPNuGetPackages\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary\2.2.8-rel-33220-00\build\runtime.win10-x86.Microsoft.Net.Native.SharedLibrary.props')">2.2.8-rel-33220-00</DotNetNativeRuntimeVersion>

<!-- The name 'DotNetNativeVersion' is critical for restoring the right .NET framework libraries -->
<UWPCoreRuntimeSdkVersion>UWP_CORE_RUNTIME_SDK_VERSION_NOT_SET</UWPCoreRuntimeSdkVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup Label="NetCoreUniversalWindowsPlatform">
<NETCoreUWPVersion Condition="'$(NETCoreUWPVersion)' == '' Or $([MSBuild]::VersionLessThan('$(NETCoreUWPVersion)', '6.2.9'))">6.2.9</NETCoreUWPVersion>
<NETCoreUWPVersion Condition="'$(NETCoreUWPVersion)' == '' Or $([MSBuild]::VersionLessThan('$(NETCoreUWPVersion)', '6.2.14'))">6.2.14</NETCoreUWPVersion>
</PropertyGroup>

</Project>

0 comments on commit 845aad2

Please sign in to comment.