Skip to content

Remove /clr:pure from WPF C++/CLI projects #11575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vinnarayana-msft merged 6 commits into from
May 13, 2026
Merged

Remove /clr:pure from WPF C++/CLI projects #11575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e5d2c0e
Remove /clr:pure from WPF C++/CLI projects
vinnarayana-msft Apr 13, 2026
31c2e8d
Merge branch 'dotnet:main' into user/vinnarayana/remove-clr-pure-main
vinnarayana-msft Apr 22, 2026
5f0341e
Remove empty PropertyGroup left from /clr:pure removal
vinnarayana-msft Apr 22, 2026
2aad7ee
Remove dead CLRSupport==pure reference from DllRenameClause
vinnarayana-msft May 8, 2026
c0ee70a
Merge branch 'dotnet:main' into user/vinnarayana/remove-clr-pure-main
vinnarayana-msft May 11, 2026
1fec6c8
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-maestro[bot] May 12, 2026
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
2 changes: 1 addition & 1 deletion eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props
<SystemSecurityPermissionsPackageVersion>11.0.0-preview.5.26229.113</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.5.26229.113</SystemWindowsExtensionsPackageVersion>
<!-- dotnet-wpf-int dependencies -->
<MicrosoftDotNetWpfDncEngPackageVersion>11.0.0-preview.2.26165.1</MicrosoftDotNetWpfDncEngPackageVersion>
<MicrosoftDotNetWpfDncEngPackageVersion>11.0.0-preview.2.26262.2</MicrosoftDotNetWpfDncEngPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="11.0.0-preview.2.26165.1">
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="11.0.0-preview.2.26262.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>6e4ce3f54f3417a3bd31e9631ee20afb3a9ed0a3</Sha>
<Sha>0f3efdfc3b5fe2e9ff10112b632914d6c26b230b</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.5.26229.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand Down
15 changes: 4 additions & 11 deletions eng/WpfArcadeSdk/tools/Wpf.Cpp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,9 @@
</PropertyGroup>

<PropertyGroup>
<ManagedCxx Condition="'$(CLRSupport)'!='true'">false</ManagedCxx>
<ManagedCxx Condition="'$(CLRSupport)'!='true' and '$(CLRSupport)'!='NetCore'">false</ManagedCxx>
<ManagedCxx Condition="'$(CLRSupport)'=='true'">true</ManagedCxx>
<ManagedCxx Condition="'$(CLRSupport)'=='pure'">true</ManagedCxx>
</PropertyGroup>

<!--
Enable IDE support for C++/CLI .NET Core builds
-->
<PropertyGroup>
<CLRSupport Condition="'$(CLRSupport)' == 'pure'">NetCore</CLRSupport>
<ManagedCxx Condition="'$(CLRSupport)'=='NetCore'">true</ManagedCxx>
</PropertyGroup>

<!--
Expand Down Expand Up @@ -158,13 +151,13 @@
- Supported only on Release builds
- WPF will carry a privatized copy of vcruntime with it - renamed with suffix _cor3
- Debug builds normally link to Static VCRT by default, and linking to a privatized vcruntime is not required
- Managed C++ assemblies that utilize /clr:pure always link to vcruntime implicitly, and should employ this
- Managed C++ assemblies that utilize /clr:netcore always link to vcruntime implicitly, and should employ this
DLL renaming at link time and reference the privatized copy of vcruntime.
- It is in fact possible to create private builds of WPF that links to debug builds of redistributable vcruntime. We do not support
linking to a privatized copy of vcruntime140d.dll here. Such build should simply copy over the debug version of vcruntime DLL's
to the appropriate location for testing purposes.
-->
<DllRenameClause Condition="('$(UseStaticVCRT)'!='true' or '$(CLRSupport)'=='pure' or '$(CLRSupport)' == 'NetCore') And '$(Configuration)'=='Release'">/dllrename:$(VCRuntimeDllBaseName)$(VCRuntimeVersion)$(LibSuffix)=$(VCRuntimeDllBaseName)$(VCRuntimeVersion)$(LibSuffix)$(WpfVersionSuffix)</DllRenameClause>
<DllRenameClause Condition="('$(UseStaticVCRT)'!='true' or '$(CLRSupport)' == 'NetCore') And '$(Configuration)'=='Release'">/dllrename:$(VCRuntimeDllBaseName)$(VCRuntimeVersion)$(LibSuffix)=$(VCRuntimeDllBaseName)$(VCRuntimeVersion)$(LibSuffix)$(WpfVersionSuffix)</DllRenameClause>


<StandardLibrariesForNativeCpp Condition="'$(ManagedCxx)'=='false'">$(StaticUCRTLibrary);$(StaticVCRTLibrary);$(StaticCRTStartupLibrary);$(StaticStandardCppLibrary);$(DynamicUCRTLibrary);$(DynamicVCRTLibrary);$(DynamicCRTStartupLibrary);$(DynamicStandardCppLibrary)</StandardLibrariesForNativeCpp>
Expand Down
2 changes: 1 addition & 1 deletion ...DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/intsafe_private_copy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ typedef unsigned __int64 ULONGLONG;
//
#if defined(MIDL_PASS) || defined(RC_INVOKED) || defined(_M_CEE_PURE) \
|| defined(_68K_) || defined(_MPPC_) \
|| defined(_M_IA64) || defined(_M_AMD64)
|| defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM64)
Comment thread
dipeshmsft marked this conversation as resolved.
// DevDiv LKG RC Changes
// Description: Define only if it is not already defined.
// added conditional to note conflict with public\ddk\inc\ntdef.h
Expand Down
11 changes: 3 additions & 8 deletions src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup>
<Keyword>NetCoreCProj</Keyword>
<CLRSupport>pure</CLRSupport>
<CLRSupport>NetCore</CLRSupport>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ConfigurationType>DynamicLibrary</ConfigurationType>
</PropertyGroup>
Expand All @@ -57,7 +57,7 @@
<ClCompile>
<AdditionalOptions>%(AdditionalOptions) /clr:initLocals</AdditionalOptions>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(WpfSharedDir)\inc;.\;.\CPP</AdditionalIncludeDirectories>
<CompileAsManaged>pure</CompileAsManaged>
<CompileAsManaged>NetCore</CompileAsManaged>
<PreprocessorDefinitions>$(CDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>precomp.hxx</PrecompiledHeaderFile>
<ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
Expand Down Expand Up @@ -92,12 +92,7 @@
<ItemGroup>
<AdditionalPackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
</ItemGroup>
<!--
Ignore ijwhost.dll during packaging
-->
<ItemGroup>
Comment thread
vinnarayana-msft marked this conversation as resolved.
<FileNamesExcludedFromPackaging Include="ijwhost.dll" />
</ItemGroup>
<!-- ijwhost.dll is required for mixed-mode C++/CLI assemblies -->
<Target Name="AddWindowsBaseDefine" AfterTargets="ResolveProjectReferences">
<Error Text="Unexpected result from _WindowsBaseReference '@(_WindowsBaseReference->Count())'" Condition="'@(_WindowsBaseReference->Count())' != '1'" />
<PropertyGroup>
Expand Down
11 changes: 3 additions & 8 deletions src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup>
<Keyword>NetCoreCProj</Keyword>
<CLRSupport>pure</CLRSupport>
<CLRSupport>NetCore</CLRSupport>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ConfigurationType>DynamicLibrary</ConfigurationType>
</PropertyGroup>
Expand All @@ -57,7 +57,7 @@
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(WpfSharedDir)\inc;.\CPP;.\CPP\inc;.\CPP\inc\GDIExporter</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(CDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CompileAsManaged>pure</CompileAsManaged>
<CompileAsManaged>NetCore</CompileAsManaged>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>Win32Inc.hpp</PrecompiledHeaderFile>
<ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
Expand Down Expand Up @@ -161,12 +161,7 @@
<ItemGroup>
<AdditionalPackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
</ItemGroup>
<!--
Ignore ijwhost.dll during packaging
-->
<ItemGroup>
<FileNamesExcludedFromPackaging Include="ijwhost.dll" />
</ItemGroup>
<!-- ijwhost.dll is required for mixed-mode C++/CLI assemblies -->
<Target Name="AddDefineReferences" BeforeTargets="ClCompile" AfterTargets="ResolveReferences" Returns="@(CLCompile)">
<PropertyGroup>
<_defineReferences>@(_defineReference->'%(Define)=&lt;%(Identity)&gt;')</_defineReferences>
Expand Down