Skip to content

Commit 8a64027

Browse files
Sergio0694Scottj1s
andauthored
Remove MRT Core .props/.targets files (#4988)
* Remove MRT Core .props/.targets files * Update .nuspec, remove leftovers * remove mrtcore.targets * remove ProjectItemsSchema.xaml --------- Co-authored-by: Scott Jones <[email protected]>
1 parent fc5962d commit 8a64027

10 files changed

+3
-1780
lines changed

BuildAll.ps1

-9
Original file line numberDiff line numberDiff line change
@@ -304,18 +304,9 @@ Try {
304304
}
305305
}
306306

307-
# copy MRT IDL over.
308-
Copy-Item -path "$MRTSourcesDirectory\mrt\Microsoft.Windows.ApplicationModel.Resources\src\Microsoft.Windows.ApplicationModel.Resources.idl" -destination "$BasePath\include" -force
309-
310307
# Copy MRT metadata files.
311-
Copy-Item -Path "$MRTSourcesDirectory\packaging\MrtCore.props" -Destination "$BasePath\build"
312-
Copy-Item -Path "$MRTSourcesDirectory\packaging\MrtCore.PriGen.targets" -Destination "$BasePath\build"
313-
Copy-Item -Path "$MRTSourcesDirectory\packaging\MrtCore.References.targets" -Destination "$BasePath\build"
314-
Copy-Item -Path "$MRTSourcesDirectory\packaging\MrtCore.targets" -Destination "$BasePath\build"
315308
Copy-Item -Path "$MRTSourcesDirectory\packaging\native\MrtCore.C.props" -Destination "$BasePath\build\native"
316309
Copy-Item -Path "$MRTSourcesDirectory\packaging\native\MrtCore.props" -Destination "$BasePath\build\native"
317-
Copy-Item -Path "$MRTSourcesDirectory\packaging\native\MrtCore.targets" -Destination "$BasePath\build\native"
318-
Copy-Item -Path "$MRTSourcesDirectory\packaging\ProjectItemsSchema.xaml" -Destination "$BasePath\build"
319310
Copy-Item -Path "$MRTSourcesDirectory\packaging\README.md" -Destination "$BasePath\build"
320311
Copy-Item -Path "$MRTSourcesDirectory\mrt\core\src\MRM.h" -Destination "$BasePath\include"
321312
Copy-Item -Path "$MRTSourcesDirectory\mrt\Microsoft.Windows.ApplicationModel.Resources\src\Microsoft.Windows.ApplicationModel.Resources.idl" -Destination "$BasePath\include"

build/NuSpecs/Microsoft.WindowsAppSDK.Foundation.props

-6
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,4 @@
88
<WindowsAppSdkFoundation>true</WindowsAppSdkFoundation>
99
</PropertyGroup>
1010

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

build/NuSpecs/Microsoft.WindowsAppSDK.Foundation.targets

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
33
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44

5-
<Import Project="$(MSBuildThisFileDirectory)MrtCore.targets" />
6-
75
<Import Project="$(MSBuildThisFileDirectory)Microsoft.WindowsAppSDK.BootstrapCommon.targets" />
86
<Import Project="$(MSBuildThisFileDirectory)Microsoft.WindowsAppSDK.Bootstrap.CS.targets" Condition="'$(WindowsAppSdkBootstrapInitialize)' == 'true'"/>
97

dev/MRTCore/packaging/MrtCore.PriGen.targets

-1,675
This file was deleted.

dev/MRTCore/packaging/MrtCore.References.targets

-23
This file was deleted.

dev/MRTCore/packaging/MrtCore.props

-31
This file was deleted.

dev/MRTCore/packaging/MrtCore.targets

-12
This file was deleted.

dev/MRTCore/packaging/ProjectItemsSchema.xaml

-16
This file was deleted.

dev/MRTCore/packaging/README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
MrtCore.targets generates PRIs in unpackaged app projects and unpackaged library projects.
2-
MrtCore.targets consists of some of the targets from the in-box file Microsoft.AppxPackage.Targets, with a few modified slightly.
1+
All .props/.targets files here have been moved to https://www.nuget.org/packages/Microsoft.Windows.SDK.BuildTools.MSIX.
2+
3+
Only some .props for native projects are left here, as they depend on 'mrm.dll', which is part of WindowsAppSDK.

dev/MRTCore/packaging/native/MrtCore.targets

-4
This file was deleted.

0 commit comments

Comments
 (0)