diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 42345044cc9..5509fa51b2e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 11.0.0-preview.5.26229.113 11.0.0-preview.5.26229.113 - 11.0.0-preview.2.26165.1 + 11.0.0-preview.2.26262.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 319274ed6e6..0f841adfce1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet 4c4e7f410fc876590f219fc6022b6c18d6f6a475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 6e4ce3f54f3417a3bd31e9631ee20afb3a9ed0a3 + 0f3efdfc3b5fe2e9ff10112b632914d6c26b230b https://github.com/dotnet/dotnet diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props index 6076423b7a6..1dcb33c8f62 100644 --- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props +++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props @@ -48,16 +48,9 @@ - false + false true - true - - - - - NetCore + true - /dllrename:$(VCRuntimeDllBaseName)$(VCRuntimeVersion)$(LibSuffix)=$(VCRuntimeDllBaseName)$(VCRuntimeVersion)$(LibSuffix)$(WpfVersionSuffix) + /dllrename:$(VCRuntimeDllBaseName)$(VCRuntimeVersion)$(LibSuffix)=$(VCRuntimeDllBaseName)$(VCRuntimeVersion)$(LibSuffix)$(WpfVersionSuffix) $(StaticUCRTLibrary);$(StaticVCRTLibrary);$(StaticCRTStartupLibrary);$(StaticStandardCppLibrary);$(DynamicUCRTLibrary);$(DynamicVCRTLibrary);$(DynamicCRTStartupLibrary);$(DynamicStandardCppLibrary) diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/intsafe_private_copy.h b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/intsafe_private_copy.h index 7fe53745b72..7128dfe5eb4 100644 --- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/intsafe_private_copy.h +++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/intsafe_private_copy.h @@ -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) // DevDiv LKG RC Changes // Description: Define only if it is not already defined. // added conditional to note conflict with public\ddk\inc\ntdef.h diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj index f1091cbad02..fa961964860 100644 --- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj +++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj @@ -39,7 +39,7 @@ NetCoreCProj - pure + NetCore 10.0 DynamicLibrary @@ -57,7 +57,7 @@ %(AdditionalOptions) /clr:initLocals %(AdditionalIncludeDirectories);$(WpfSharedDir)\inc;.\;.\CPP - pure + NetCore $(CDefines);%(PreprocessorDefinitions) precomp.hxx false @@ -92,12 +92,7 @@ - - - - + diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj index d2fe5dc40de..16c743024d6 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj @@ -40,7 +40,7 @@ NetCoreCProj - pure + NetCore 10.0 DynamicLibrary @@ -57,7 +57,7 @@ %(AdditionalIncludeDirectories);$(WpfSharedDir)\inc;.\CPP;.\CPP\inc;.\CPP\inc\GDIExporter $(CDefines);%(PreprocessorDefinitions) - pure + NetCore Use Win32Inc.hpp false @@ -161,12 +161,7 @@ - - - - + <_defineReferences>@(_defineReference->'%(Define)=<%(Identity)>')