Compare commits
9 commits
main
...
dev/migrie
Author | SHA1 | Date | |
---|---|---|---|
73cff65510 | |||
aac2ad2b92 | |||
73a86c6a1c | |||
3295e43e3e | |||
953dad900c | |||
0fbd4fc844 | |||
4b291b5c15 | |||
dcb15c096d | |||
688888fe3b |
|
@ -118,6 +118,23 @@
|
||||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
BODGY
|
||||||
|
|
||||||
|
The wapproj `GetResolvedWinMD` target tries to get a winmd from every cppwinrt
|
||||||
|
executable we put in the package. But we DON'T produce a winmd. This makes the
|
||||||
|
FastUpToDate check fail every time, and leads to the whole wapproj build
|
||||||
|
running even if you're just f5'ing the package. EVEN AFTER A SUCCESSFUL BUILD.
|
||||||
|
|
||||||
|
Setting GenerateWindowsMetadata=false is enough to tell the build system that
|
||||||
|
we don't produce one, and get it off our backs.
|
||||||
|
-->
|
||||||
|
<ItemDefinitionGroup>
|
||||||
|
<Link>
|
||||||
|
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
||||||
|
|
||||||
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets')" />
|
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets')" />
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
||||||
<Import Project="$(OpenConsoleDir)src\wap-common.build.pre.props" />
|
<Import Project="$(OpenConsoleDir)src\wap-common.build.pre.props" />
|
||||||
|
@ -50,7 +50,6 @@
|
||||||
<PRIResource Include="Resources\Resources.resw" />
|
<PRIResource Include="Resources\Resources.resw" />
|
||||||
<OCResourceDirectory Include="Resources" />
|
<OCResourceDirectory Include="Resources" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- This is picked up by CascadiaResources.build.items. -->
|
<!-- This is picked up by CascadiaResources.build.items. -->
|
||||||
<PropertyGroup Condition="'$(WindowsTerminalBranding)'==''">
|
<PropertyGroup Condition="'$(WindowsTerminalBranding)'==''">
|
||||||
<WindowsTerminalAssetSuffix>-Dev</WindowsTerminalAssetSuffix>
|
<WindowsTerminalAssetSuffix>-Dev</WindowsTerminalAssetSuffix>
|
||||||
|
@ -58,18 +57,29 @@
|
||||||
<PropertyGroup Condition="'$(WindowsTerminalBranding)'=='Preview'">
|
<PropertyGroup Condition="'$(WindowsTerminalBranding)'=='Preview'">
|
||||||
<WindowsTerminalAssetSuffix>-Pre</WindowsTerminalAssetSuffix>
|
<WindowsTerminalAssetSuffix>-Pre</WindowsTerminalAssetSuffix>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<Import Project="$(MSBuildThisFileDirectory)..\CascadiaResources.build.items" />
|
<Import Project="$(MSBuildThisFileDirectory)..\CascadiaResources.build.items" />
|
||||||
<Import Project="$(OpenConsoleDir)src\wap-common.build.post.props" />
|
<Import Project="$(OpenConsoleDir)src\wap-common.build.post.props" />
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\WindowsTerminal\WindowsTerminal.vcxproj" />
|
|
||||||
<ProjectReference Include="..\..\host\exe\Host.EXE.vcxproj" />
|
|
||||||
<ProjectReference Include="..\..\host\proxy\Host.Proxy.vcxproj" />
|
|
||||||
<ProjectReference Include="..\TerminalAzBridge\TerminalAzBridge.vcxproj" />
|
|
||||||
<ProjectReference Include="..\ShellExtension\WindowsTerminalShellExt.vcxproj" />
|
|
||||||
<ProjectReference Include="..\wt\wt.vcxproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\WindowsTerminal\WindowsTerminal.vcxproj">
|
||||||
|
<Project>{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}</Project>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalAzBridge\TerminalAzBridge.vcxproj">
|
||||||
|
<Project>{067F0A06-FCB7-472C-96E9-B03B54E8E18D}</Project>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\ShellExtension\WindowsTerminalShellExt.vcxproj">
|
||||||
|
<Project>{f2ed628a-db22-446f-a081-4cc845b51a2b}</Project>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\wt\wt.vcxproj">
|
||||||
|
<Project>{506fd703-baa7-4f6e-9361-64f550ec8fca}</Project>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="$(OpenConsoleDir)src\host\exe\Host.EXE.vcxproj">
|
||||||
|
<Project>{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}</Project>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="$(OpenConsoleDir)src\host\proxy\Host.Proxy.vcxproj">
|
||||||
|
<Project>{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}</Project>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
<Target Name="OpenConsoleStompSourceProjectForWapProject" BeforeTargets="_ConvertItems">
|
<Target Name="OpenConsoleStompSourceProjectForWapProject" BeforeTargets="_ConvertItems">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Stomp all "SourceProject" values for all incoming dependencies to flatten the package. -->
|
<!-- Stomp all "SourceProject" values for all incoming dependencies to flatten the package. -->
|
||||||
|
@ -121,7 +131,6 @@
|
||||||
<AppxUploadPackagePayload Remove="@(AppxUploadPackagePayload)" Condition="'%(Extension)' == '.pri' and '%(Filename)' != 'resources'" />
|
<AppxUploadPackagePayload Remove="@(AppxUploadPackagePayload)" Condition="'%(Extension)' == '.pri' and '%(Filename)' != 'resources'" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<!-- **BEGIN VC LIBS HACK** -->
|
<!-- **BEGIN VC LIBS HACK** -->
|
||||||
<!--
|
<!--
|
||||||
For our release builds, we're just going to integrate the UWPDesktop CRT into our package and delete the package dependencies.
|
For our release builds, we're just going to integrate the UWPDesktop CRT into our package and delete the package dependencies.
|
||||||
|
@ -136,7 +145,6 @@
|
||||||
<FrameworkSdkReference Remove="@(FrameworkSdkReference)" />
|
<FrameworkSdkReference Remove="@(FrameworkSdkReference)" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<!-- This target removes the FrameworkSdkPackages from before the *desktop bridge* manifest generation happens. -->
|
<!-- This target removes the FrameworkSdkPackages from before the *desktop bridge* manifest generation happens. -->
|
||||||
<Target Name="_OpenConsoleStripAllDependenciesFromPackageSecondManifest" BeforeTargets="_GenerateDesktopBridgeAppxManifest" DependsOnTargets="_ResolveVCLibDependencies">
|
<Target Name="_OpenConsoleStripAllDependenciesFromPackageSecondManifest" BeforeTargets="_GenerateDesktopBridgeAppxManifest" DependsOnTargets="_ResolveVCLibDependencies">
|
||||||
<ItemGroup Condition="'$(WindowsTerminalOfficialBuild)'=='true'">
|
<ItemGroup Condition="'$(WindowsTerminalOfficialBuild)'=='true'">
|
||||||
|
@ -144,7 +152,6 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Target>
|
</Target>
|
||||||
<!-- **END VC LIBS HACK** -->
|
<!-- **END VC LIBS HACK** -->
|
||||||
|
|
||||||
<!-- This is required to get the package dependency in the AppXManifest. -->
|
<!-- This is required to get the package dependency in the AppXManifest. -->
|
||||||
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets')" />
|
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets')" />
|
||||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||||
|
@ -153,6 +160,5 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets'))" />
|
<Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets'))" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
|
<Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -316,9 +316,30 @@
|
||||||
<Project>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</Project>
|
<Project>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</Project>
|
||||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
|
|
||||||
<!-- For whatever reason, we can't include the TerminalControl and
|
<!-- For whatever reason, we can't include the TerminalControl and
|
||||||
TerminalSettings projects' winmds via project references. So we'll have to
|
TerminalSettings projects' winmds via project references. So we'll have to
|
||||||
manually include the winmds as References below -->
|
manually include the winmds as References below
|
||||||
|
|
||||||
|
BODGY: we do need to add a ProjectReference to TerminalControl.vcxproj,
|
||||||
|
with Private=true, ReferenceOutputAssembly=false, so that Visual Studio's
|
||||||
|
"Fast Up-to-date Check" will work with this project. If we don't, the Fast
|
||||||
|
Up-to-date Check will look for the .xaml files from that project in our
|
||||||
|
output, which won't actually be there.
|
||||||
|
-->
|
||||||
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\dll\TerminalControl.vcxproj">
|
||||||
|
<!-- Private:false and ReferenceOutputAssembly:false, in combination with
|
||||||
|
the manual reference to TerminalControl.winmd below make sure that this
|
||||||
|
project will compile correct, and that we won't roll up the TermControl
|
||||||
|
xbf's into the packaging project twice. -->
|
||||||
|
<Private>true</Private>
|
||||||
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsEditor\Microsoft.Terminal.Settings.Editor.vcxproj">
|
||||||
|
<Private>true</Private>
|
||||||
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
|
</ProjectReference>
|
||||||
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- This is a hack to get the ARM64 CI build working. See
|
<!-- This is a hack to get the ARM64 CI build working. See
|
||||||
|
|
|
@ -68,5 +68,22 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
BODGY
|
||||||
|
|
||||||
|
The wapproj `GetResolvedWinMD` target tries to get a winmd from every cppwinrt
|
||||||
|
executable we put in the package. But we DON'T produce a winmd. This makes the
|
||||||
|
FastUpToDate check fail every time, and leads to the whole wapproj build
|
||||||
|
running even if you're just f5'ing the package. EVEN AFTER A SUCCESSFUL BUILD.
|
||||||
|
|
||||||
|
Setting GenerateWindowsMetadata=false is enough to tell the build system that
|
||||||
|
we don't produce one, and get it off our backs.
|
||||||
|
-->
|
||||||
|
<ItemDefinitionGroup>
|
||||||
|
<Link>
|
||||||
|
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<Import Project="$(OpenConsoleDir)\build\rules\GenerateSxsManifestsFromWinmds.targets" />
|
<Import Project="$(OpenConsoleDir)\build\rules\GenerateSxsManifestsFromWinmds.targets" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -97,4 +97,47 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
|
<Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
|
||||||
</Project>
|
|
||||||
|
<Target
|
||||||
|
Name="_Post_CopyFilesMarkedCopyLocal"
|
||||||
|
AfterTargets="_CopyFilesMarkedCopyLocal"
|
||||||
|
Condition="'@(ReferenceCopyLocalPaths)' != ''">
|
||||||
|
|
||||||
|
<!-- <PropertyGroup>
|
||||||
|
<CreateHardLinksForCopyLocalIfPossible Condition="'$(BuildingInsideVisualStudio)' == 'true' or '$(CreateHardLinksForCopyLocalIfPossible)' == ''">false</CreateHardLinksForCopyLocalIfPossible>
|
||||||
|
<CreateSymbolicLinksForCopyLocalIfPossible Condition="'$(BuildingInsideVisualStudio)' == 'true' or '$(CreateSymbolicLinksForCopyLocalIfPossible)' == ''">false</CreateSymbolicLinksForCopyLocalIfPossible>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Copy
|
||||||
|
SourceFiles="@(ReferenceCopyLocalPaths)"
|
||||||
|
DestinationFiles="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')"
|
||||||
|
SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
|
||||||
|
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
|
||||||
|
Retries="$(CopyRetryCount)"
|
||||||
|
RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
|
||||||
|
UseHardlinksIfPossible="$(CreateHardLinksForCopyLocalIfPossible)"
|
||||||
|
UseSymboliclinksIfPossible="$(CreateSymbolicLinksForCopyLocalIfPossible)"
|
||||||
|
Condition="'$(UseCommonOutputDirectory)' != 'true'"
|
||||||
|
>
|
||||||
|
|
||||||
|
<Output TaskParameter="DestinationFiles" ItemName="FileWritesShareable"/>
|
||||||
|
<Output TaskParameter="CopiedFiles" ItemName="ReferencesCopiedInThisBuild"/>
|
||||||
|
<Output TaskParameter="WroteAtLeastOneFile" PropertyName="WroteAtLeastOneFile"/>
|
||||||
|
|
||||||
|
</Copy> -->
|
||||||
|
|
||||||
|
<!-- If this project produces reference assemblies *and* copied (possibly transitive)
|
||||||
|
references on this build, subsequent builds of projects that depend on it must
|
||||||
|
not be considered up to date, so touch this marker file that is considered an
|
||||||
|
input to projects that reference this one. -->
|
||||||
|
<Touch Files="@(CopyUpToDateMarker)"
|
||||||
|
AlwaysCreate="true" />
|
||||||
|
|
||||||
|
<!-- <ItemGroup>
|
||||||
|
<FileWrites Include="@(CopyUpToDateMarker)" />
|
||||||
|
</ItemGroup> -->
|
||||||
|
|
||||||
|
</Target>
|
||||||
|
|
||||||
|
|
||||||
|
</Project>
|
||||||
|
|
|
@ -197,9 +197,27 @@
|
||||||
<Project>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</Project>
|
<Project>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</Project>
|
||||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
|
|
||||||
<!-- For whatever reason, we can't include the TerminalControl and
|
<!-- For whatever reason, we can't include the TerminalControl and
|
||||||
TerminalSettings projects' winmds via project references. So we'll have to
|
TerminalSettings projects' winmds via project references. So we'll have to
|
||||||
manually include the winmds as References below -->
|
manually include the winmds as References below
|
||||||
|
|
||||||
|
BODGY: we do need to add a ProjectReference to TerminalControl.vcxproj,
|
||||||
|
with Private=true, ReferenceOutputAssembly=false, so that Visual Studio's
|
||||||
|
"Fast Up-to-date Check" will work with this project. If we don't, the Fast
|
||||||
|
Up-to-date Check will look for the .xaml files from that project in our
|
||||||
|
output, which won't actually be there.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\dll\TerminalControl.vcxproj">
|
||||||
|
<!-- Private:false and ReferenceOutputAssembly:false, in combination with
|
||||||
|
the manual reference to TerminalControl.winmd below make sure that this
|
||||||
|
project will compile correct, and that we won't roll up the TermControl
|
||||||
|
xbf's into the packaging project twice. -->
|
||||||
|
<Private>true</Private>
|
||||||
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
|
</ProjectReference>
|
||||||
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Manually add references to each of our dependent winmds. Mark them as
|
<!-- Manually add references to each of our dependent winmds. Mark them as
|
||||||
|
@ -266,4 +284,9 @@
|
||||||
</Target>
|
</Target>
|
||||||
<Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
|
<Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
|
||||||
<Import Project="..\..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.2.3.2262\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets" Condition="Exists('..\..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.2.3.2262\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" />
|
<Import Project="..\..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.2.3.2262\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets" Condition="Exists('..\..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.2.3.2262\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" />
|
||||||
|
|
||||||
|
|
||||||
|
<!-- <ItemGroup>
|
||||||
|
<UpToDateCheckInput Remove="$(OpenConsoleCommonOutDir)\$(ProjectName)\microsoft.terminal.control\*.xaml" />
|
||||||
|
</ItemGroup> -->
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -115,6 +115,23 @@
|
||||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
BODGY
|
||||||
|
|
||||||
|
The wapproj `GetResolvedWinMD` target tries to get a winmd from every cppwinrt
|
||||||
|
executable we put in the package. But we DON'T produce a winmd. This makes the
|
||||||
|
FastUpToDate check fail every time, and leads to the whole wapproj build
|
||||||
|
running even if you're just f5'ing the package. EVEN AFTER A SUCCESSFUL BUILD.
|
||||||
|
|
||||||
|
Setting GenerateWindowsMetadata=false is enough to tell the build system that
|
||||||
|
we don't produce one, and get it off our backs.
|
||||||
|
-->
|
||||||
|
<ItemDefinitionGroup>
|
||||||
|
<Link>
|
||||||
|
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
||||||
|
|
||||||
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets')" />
|
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets')" />
|
||||||
|
|
|
@ -36,17 +36,17 @@ if not defined VSWHERE (
|
||||||
goto :EXIT
|
goto :EXIT
|
||||||
)
|
)
|
||||||
|
|
||||||
rem Add path to MSBuild Binaries
|
rem rem Add path to MSBuild Binaries
|
||||||
for /f "usebackq tokens=*" %%B in (`%VSWHERE% -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe 2^>nul`) do (
|
rem for /f "usebackq tokens=*" %%B in (`%VSWHERE% -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe 2^>nul`) do (
|
||||||
set MSBUILD=%%B
|
rem set MSBUILD=%%B
|
||||||
)
|
rem )
|
||||||
|
|
||||||
rem Try to find MSBuild in prerelease versions of MSVS
|
rem Try to find MSBuild in prerelease versions of MSVS
|
||||||
if not defined MSBUILD (
|
rem if not defined MSBUILD (
|
||||||
for /f "usebackq tokens=*" %%B in (`%VSWHERE% -latest -prerelease -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe 2^>nul`) do (
|
for /f "usebackq tokens=*" %%B in (`%VSWHERE% -latest -prerelease -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe 2^>nul`) do (
|
||||||
set MSBUILD=%%B
|
set MSBUILD=%%B
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
rem )
|
||||||
|
|
||||||
if not defined MSBUILD (
|
if not defined MSBUILD (
|
||||||
echo Could not find MsBuild on your machine. Please set the MSBUILD variable to the location of MSBuild.exe and run razzle again.
|
echo Could not find MsBuild on your machine. Please set the MSBUILD variable to the location of MSBuild.exe and run razzle again.
|
||||||
|
|
Loading…
Reference in a new issue