diff --git a/eng/Tools.props b/eng/Tools.props deleted file mode 100644 index 1393e1776e8..00000000000 --- a/eng/Tools.props +++ /dev/null @@ -1,15 +0,0 @@ - - - - <_RuntimeIdentifier Condition="'$(Platform)' == ''">win-x86 - <_RuntimeIdentifier Condition="'$(Platform)' != ''">win-$(Platform) - - - - - - - - - - diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props index ff7880c6991..ed45ed7321d 100644 --- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props +++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props @@ -2,6 +2,7 @@ true + true diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets index 6dd7eb19ed8..a9f423ccda7 100644 --- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets +++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets @@ -6,11 +6,7 @@ - - + Condition="'$(MSBuildProjectExtension)'!='.vcxproj' or '$(ManagedCxx)'=='true'"/> - - false - false - false - - false - - - - - - - - - - - - - - - <_ResolvedRuntimePackPath>@(ResolvedRuntimePack->WithMetadataValue('FrameworkName', 'Microsoft.NETCore.App')->Metadata('Path')) - - - - - $(NuGetPackageRoot)microsoft.netcore.app.ref\$(MicrosoftNETCoreAppRefVersion) - $(MicrosoftNETCoreAppRefVersion) - $(_ResolvedRuntimePackPath) - $(MicrosoftNETCoreAppRuntimewinx64Version) - - - - - - - - - @(ResolvedAppHostPack->'%(Path)') - - - - @(ResolvedIjwHostPack->'%(Path)') - - - diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets index d98a8708e26..3d761def5d4 100644 --- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets +++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets @@ -276,160 +276,6 @@ using namespace System::Runtime::Versioning; - - - - CppCliHelper; - $(ResolveReferencesDependsOn) - - - $(EnsureWpfProjectReferenceDependsOn); - CppCliHelper - - - - - - - - $(IntermediateOutputPath)CppCliSupport\CppClrSupport_$(MSBuildProjectName).csproj - - - - - - - - - net6.0 - AnyCPU%3Bx64%3Barm64 - - ]]> - - - - - - - - - <_AdditionalPackages Remove="%40(_AdditionalPackages)" /> - <_AdditionalPackages Include="%24(AdditionalPackages)" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - - - - AdditionalPackages=@(AdditionalPackageReference->'%(Identity)+%(Version)') - - - - - - - - - - False - - - - - - - - - CppHelper; diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj index 55531081afc..95dc1ea07e8 100644 --- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj +++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj @@ -28,8 +28,6 @@ true - .NETCoreApp - Unknown - + - +