Skip to content
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.

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

Remove MRT Core .props/.targets files #4988

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions BuildAll.ps1
Original file line number Diff line number Diff line change
@@ -315,10 +315,6 @@ Try {
Copy-Item -path "$MRTSourcesDirectory\mrt\Microsoft.Windows.ApplicationModel.Resources\src\Microsoft.Windows.ApplicationModel.Resources.idl" -destination "$BasePath\include" -force

# Copy MRT metadata files.
Copy-Item -Path "$MRTSourcesDirectory\packaging\MrtCore.props" -Destination "$BasePath\build"
Copy-Item -Path "$MRTSourcesDirectory\packaging\MrtCore.PriGen.targets" -Destination "$BasePath\build"
Copy-Item -Path "$MRTSourcesDirectory\packaging\MrtCore.References.targets" -Destination "$BasePath\build"
Copy-Item -Path "$MRTSourcesDirectory\packaging\MrtCore.targets" -Destination "$BasePath\build"
Copy-Item -Path "$MRTSourcesDirectory\packaging\native\MrtCore.C.props" -Destination "$BasePath\build\native"
Copy-Item -Path "$MRTSourcesDirectory\packaging\native\MrtCore.props" -Destination "$BasePath\build\native"
Copy-Item -Path "$MRTSourcesDirectory\packaging\native\MrtCore.targets" -Destination "$BasePath\build\native"
6 changes: 0 additions & 6 deletions build/NuSpecs/Microsoft.WindowsAppSDK.Foundation.props
Original file line number Diff line number Diff line change
@@ -8,10 +8,4 @@
<WindowsAppSdkFoundation>true</WindowsAppSdkFoundation>
</PropertyGroup>

<!--
Ideally, this import would be done only if EnableCoreMrtTooling is true. That's impossible though because that
property cannot be defined beforehand.
-->
<Import Project="$(MSBuildThisFileDirectory)MrtCore.props" />

</Project>
2 changes: 0 additions & 2 deletions build/NuSpecs/Microsoft.WindowsAppSDK.Foundation.targets
Original file line number Diff line number Diff line change
@@ -2,8 +2,6 @@
<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Import Project="$(MSBuildThisFileDirectory)MrtCore.targets" />

<Import Project="$(MSBuildThisFileDirectory)Microsoft.WindowsAppSDK.BootstrapCommon.targets" />
<Import Project="$(MSBuildThisFileDirectory)Microsoft.WindowsAppSDK.Bootstrap.CS.targets" Condition="'$(WindowsAppSdkBootstrapInitialize)' == 'true'"/>

1,675 changes: 0 additions & 1,675 deletions dev/MRTCore/packaging/MrtCore.PriGen.targets

This file was deleted.

23 changes: 0 additions & 23 deletions dev/MRTCore/packaging/MrtCore.References.targets

This file was deleted.

31 changes: 0 additions & 31 deletions dev/MRTCore/packaging/MrtCore.props

This file was deleted.

12 changes: 0 additions & 12 deletions dev/MRTCore/packaging/MrtCore.targets

This file was deleted.

16 changes: 0 additions & 16 deletions dev/MRTCore/packaging/ProjectItemsSchema.xaml

This file was deleted.

5 changes: 3 additions & 2 deletions dev/MRTCore/packaging/README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
MrtCore.targets generates PRIs in unpackaged app projects and unpackaged library projects.
MrtCore.targets consists of some of the targets from the in-box file Microsoft.AppxPackage.Targets, with a few modified slightly.
All .props/.targets files here have been moved to https://www.nuget.org/packages/Microsoft.Windows.SDK.BuildTools.MSIX.

Only some .props for native projects are left here, as they depend on 'mrm.dll', which is part of WindowsAppSDK.
4 changes: 0 additions & 4 deletions dev/MRTCore/packaging/native/MrtCore.targets

This file was deleted.