Skip to content

Commit 32ede71

Browse files
committed
Remove Arcade work-around and include file
1 parent bb4137a commit 32ede71

File tree

3 files changed

+1
-96
lines changed

3 files changed

+1
-96
lines changed

src/Layout/pkg/windows/bundles/sdk/bundle.wixproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,14 @@
55
<!-- OutputType determines the extension, .msi, .wixlib, .exe, etc. -->
66
<OutputType>Bundle</OutputType>
77

8-
<IncludeSearchPaths>C:\git\forks\sdk\src\Layout\pkg\windows</IncludeSearchPaths>
9-
108
<!-- Globbing will automatically find any .wxl relative to the project file. Since we're simshipping localized content for
119
the bundle UI, we either need to exclude the .wxl files or place them in a directory outside of the project. For simshipping
1210
we only need to ensure the files are pulled in as additional payloads into the UX container. -->
1311
<DefaultItemExcludes>$(DefaultItemExcludes);LCID\**\*</DefaultItemExcludes>
1412
</PropertyGroup>
1513

1614
<ItemGroup>
17-
<!-- TODO: Swap out once the encoding issue in the Arcade copy is fixed. The local copy will be picked up
18-
by normal globbing. -->
19-
<!--<Compile Include="$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix5\bundle\upgradePolicies.wxs" />-->
15+
<Compile Include="$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix5\bundle\upgradePolicies.wxs" />
2016

2117
<!-- This file is generated by the redist.csproj project. The fragment defines a package group
2218
to chain external MSIs from runtime, ASP.NET, and Windows Desktop into the bundle. There is no conditional

src/Layout/pkg/windows/bundles/sdk/upgradePolicies.wxs

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/Layout/pkg/windows/msis/inc/variables.wxi

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)