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.

Sign up for GitHub

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

Jump to bottom

Bundle the entire CRT with our branded Release packages #5661

Merged
9 commits merged into from
Apr 30, 2020
Merged

Bundle the entire CRT with our branded Release packages #5661

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb373bb
Bundle the entire CRT with our branded Release packages
DHowett Apr 29, 2020
851391f
and spacing
DHowett Apr 29, 2020
44a700d
speeling
DHowett Apr 29, 2020
d656226
important: make sure we actually have one of the libs too
DHowett Apr 30, 2020
612a348
Move the lib aggregation down to WindowsTerminal.vcxproj
DHowett Apr 30, 2020
c0f0d4b
ffs
DHowett Apr 30, 2020
b42d184
CI HAX: force this on, revert later
DHowett Apr 30, 2020
92b773c
make the dep file check more clever
DHowett Apr 30, 2020
b5a91ac
Revert "CI HAX: force this on, revert later"
DHowett Apr 30, 2020
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
1 change: 1 addition & 0 deletions .github/actions/spell-check/dictionary/microsoft.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ microsoftonline
osgvsowi
powershell
tdbuildteamid
vcruntime
visualstudio
1 change: 1 addition & 0 deletions .github/actions/spell-check/whitelist/whitelist.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,7 @@ Delt
demoable
depersist
deprioritized
deps
deque
deref
deserialization
Expand Down
15 changes: 15 additions & 0 deletions build/scripts/Test-WindowsTerminalPackage.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,21 @@ Try {
}
}

$dependencies = $Manifest.Package.Dependencies.PackageDependency.Name
$depsHasVclibsDesktop = ("Microsoft.VCLibs.140.00.UWPDesktop" -in $dependencies) -or ("Microsoft.VCLibs.140.00.Debug.UWPDesktop" -in $dependencies)
$depsHasVcLibsAppX = ("Microsoft.VCLibs.140.00" -in $dependencies) -or ("Microsoft.VCLibs.140.00.Debug" -in $dependencies)
$filesHasVclibsDesktop = ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140.dll" -EA:Ignore)) -or ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140d.dll" -EA:Ignore))
$filesHasVclibsAppX = ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140_app.dll" -EA:Ignore)) -or ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140d_app.dll" -EA:Ignore))

If ($depsHasVclibsDesktop -and $filesHasVclibsDesktop) {
Throw "Package has Dependency *and* integrated Desktop VCLibs"
}

If ($depsHasVclibsAppx -and $filesHasVclibsAppx) {
# We've shipped like this forever, so downgrade to warning.
Write-Warning "Package has Dependency *and* integrated AppX VCLibs"
}

### Check that we have an App.xbf (which is a proxy for our resources having been merged)
$resourceXpath = '/PriInfo/ResourceMap/ResourceMapSubtree[@name="Files"]/NamedResource[@name="App.xbf"]'
$AppXbf = $PRIFile.SelectSingleNode($resourceXpath)
Expand Down
36 changes: 36 additions & 0 deletions src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,42 @@
<AppxUploadPackagePayload Remove="@(AppxUploadPackagePayload)" Condition="'%(Extension)' == '.pri' and '%(Filename)' != 'resources'" />
</ItemGroup>
</Target>

<!-- **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.
It's very difficult for users who do not have access to the store to get our dependency packages, and we want to be robust
and deployable everywhere. Since these libraries can be redistributed, it's easiest if we simply redistribute them.
-->
<PropertyGroup>
<ReasonablePlatform Condition="'$(Platform)'=='Win32'">x86</ReasonablePlatform>
<ReasonablePlatform Condition="'$(ReasonablePlatform)'==''">$(Platform)</ReasonablePlatform>
</PropertyGroup>

<ItemGroup Condition="'$(WindowsTerminalReleaseBuild)'=='true'">
<!-- Add all the CRT libs as content -->
<Content Include="$(VCToolsRedistDir)\$(ReasonablePlatform)\Microsoft.VC142.CRT\*.dll">
<DeploymentContent>true</DeploymentContent>
<Link>%(Filename)%(Extension)</Link>
</Content>
</ItemGroup>

<!-- This target removes the FrameworkSdkReferences from before the AppX package targets manifest generation happens.
This is part of the generic machinery that applies to every AppX. -->
<Target Name="_OpenConsoleStripAllDependenciesFromPackageFirstManifest" BeforeTargets="_GenerateCurrentProjectAppxManifest">
<ItemGroup Condition="'$(WindowsTerminalReleaseBuild)'=='true'">
<FrameworkSdkReference Remove="@(FrameworkSdkReference)" />
</ItemGroup>
</Target>

<!-- This target removes the FrameworkSdkPackages from before the *desktop bridge* manifest generation happens. -->
<Target Name="_OpenConsoleStripAllDependenciesFromPackageSecondManifest" BeforeTargets="_GenerateDesktopBridgeAppxManifest" DependsOnTargets="_ResolveVCLibDependencies">
<ItemGroup Condition="'$(WindowsTerminalReleaseBuild)'=='true'">
<FrameworkSdkPackage Remove="@(FrameworkSdkPackage)" />
</ItemGroup>
</Target>
<!-- **END VC LIBS HACK** -->

<!-- This is required to get the package dependency in the AppXManifest. -->
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down