Skip to content

Commit 412ee24

Browse files
Merge pull request #4103 from MicrosoftDocs/main638443062870540112sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents c84a947 + 526d735 commit 412ee24

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

uwp/cpp-and-winrt-apis/use-csharp-component-from-cpp-winrt.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,21 +137,21 @@ Copy and paste the following XML to the first `PropertyGroup` in `CPPWinRTCSharp
137137

138138
```xml
139139
<!-- Start Custom .NET Native properties -->
140-
<DotNetNativeVersion>2.2.9-rel-29512-01</DotNetNativeVersion>
141-
<DotNetNativeSharedLibrary>2.2.8-rel-29512-01</DotNetNativeSharedLibrary>
142-
<UWPCoreRuntimeSdkVersion>2.2.11</UWPCoreRuntimeSdkVersion>
140+
<DotNetNativeVersion>2.2.12-rel-31116-00</DotNetNativeVersion>
141+
<DotNetNativeSharedLibrary>2.2.8-rel-31116-00</DotNetNativeSharedLibrary>
142+
<UWPCoreRuntimeSdkVersion>2.2.14</UWPCoreRuntimeSdkVersion>
143143
<!--<NugetPath>$(USERPROFILE)\.nuget\packages</NugetPath>-->
144144
<NugetPath>$(ProgramFiles)\Microsoft SDKs\UWPNuGetPackages</NugetPath>
145145
<!-- End Custom .NET Native properties -->
146146
```
147147

148-
The values for `DotNetNativeVersion`, `DotNetNativeSharedLibrary`, and `UWPCoreRuntimeSdkVersion` may vary depending on the version of Visual Studio. To set them to the correct values, open the `%ProgramFiles(x86)%\Microsoft SDKs\UWPNuGetPackages` and look at the sub-directory for each value in the table below. The `%ProgramFiles(x86)%\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.Native.Compiler` directory will have a sub-directory that contains an installed version of .NET native that starts with `2.2`. In the example below, it is `2.2.9-rel-29512-01`.
148+
The values for `DotNetNativeVersion`, `DotNetNativeSharedLibrary`, and `UWPCoreRuntimeSdkVersion` may vary depending on the version of Visual Studio. To set them to the correct values, open the `%ProgramFiles(x86)%\Microsoft SDKs\UWPNuGetPackages` and look at the sub-directory for each value in the table below. The `%ProgramFiles(x86)%\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.Native.Compiler` directory will have a sub-directory that contains an installed version of .NET native that starts with `2.2`. In the example below, it is `2.2.12-rel-31116-00`.
149149

150150
> | MSBuild Variable | Directory | Example
151151
> |-| - | -
152-
> | DotNetNativeVersion | `%ProgramFiles(x86)%\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.Native.Compiler` | `2.2.9-rel-29512-01`
153-
> | DotNetNativeSharedLibrary | `%ProgramFiles(x86)%\Microsoft SDKs\UWPNuGetPackages\runtime.win10-x64.microsoft.net.native.sharedlibrary` | `2.2.8-rel-29512-01`
154-
> | UWPCoreRuntimeSdkVersion | `%ProgramFiles(x86)%\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.UWPCoreRuntimeSdk` | `2.2.11`
152+
> | DotNetNativeVersion | `%ProgramFiles(x86)%\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.Native.Compiler` | `2.2.12-rel-31116-00`
153+
> | DotNetNativeSharedLibrary | `%ProgramFiles(x86)%\Microsoft SDKs\UWPNuGetPackages\runtime.win10-x64.microsoft.net.native.sharedlibrary` | `2.2.8-rel-31116-00`
154+
> | UWPCoreRuntimeSdkVersion | `%ProgramFiles(x86)%\Microsoft SDKs\UWPNuGetPackages\Microsoft.Net.UWPCoreRuntimeSdk` | `2.2.14`
155155
156156
> [!NOTE]
157157
> There are multiple supported architectures for Microsoft.Net.Native.SharedLibrary. Replace `x64` with the appropriate architecture. For example, the `arm64` architecture would be in the `%ProgramFiles(x86)%\Microsoft SDKs\UWPNuGetPackages\runtime.win10-arm64.microsoft.net.native.sharedlibrary` directory.

0 commit comments

Comments
 (0)