Skip to content

Commit f292245

Browse files
wtgodbeCopilot
wtgodbe
and
Copilot
authored
Update to wix5 (#62885)
* Initial commit for wix5 update * Syntax error * Update wixproj's * Acquire wix sdk * Fix d.b.p/t * More ordering stuff * Get rid of superfluous import * Another import removed * Custom SDK import * Another double import * Fix hint paths * Who needs extensions? * Switch target * Remove dead switch * A couple StandardDirectory fixes * Small fix * Back to dir * Typo * Formatting * More formatting * No var. * Platform -> InstallerPlatform * No StandardDirectory * Fixups * Remove unneeded compiles * Set Scope * Ref * Modularize it * Casing * No Var for artifactsdir * Set GUID * Move the component into the feature * Generate GUIDs for ANCM DepProviders * Cheeky workaround * Revert "Cheeky workaround" This reverts commit 0e8e279. * Some formatting * NoWarn * Fix nowarn * Suppress StandardDirectory warning * Temporarily disable wixpack generation, see what explodes * Cleanup for nupkg script * Disable wixpack for testing * StandardDir * Wixpack again * Fix upgrade policy * Temporarily update Arcade * Fix prop name * New params * Remove dupes * Exclude wxl's * No var. * Split ifs * Set BindName * Manual arcade bump * Add payloads * Rename file * Update ref * Update theme * Add files * Fixup * Shorter name * Try no options * Upload unsigned bundle * Revert "Upload unsigned bundle" This reverts commit acc5a6e. * Revert "Try no options" This reverts commit 67761f3. * Revert "Shorter name" This reverts commit da62b97. * Don't rename it * Try this * More * Revert "More" This reverts commit c5206c7. * Revert "Try this" This reverts commit da99fb6. * Revert "Don't rename it" This reverts commit fcf1b51. * Try something * Remove default * Use GenerateFiles * Fixup * Fix extensions * UI Improvements * More alignment * A few more * Fixup * UI fixes * Update aspnetcore runtime bundle * Update src/Installers/Windows/Wix.targets Co-authored-by: Copilot <[email protected]> * No iswin64 * Some feedback * Feedback, KeyPath * Fixup * No need for ProductVersion * Update non-english theme files * Update bundleproj * Use wix 5 in runtime bundle * Update Arcade * Stop using WixThemeVariables * Not using hyperlink license anymore * Some loc stuff * X86 & FilesInUse * Sign less * Try new enable conditions * NOT * Fix signing * Feedback --------- Co-authored-by: Copilot <[email protected]>
1 parent 32767f4 commit f292245

File tree

90 files changed

+2831
-3449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+2831
-3449
lines changed

‎.azure/pipelines/ci-unofficial.yml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,9 @@ extends:
181181
-prepareMachine
182182
-noBuildRepoTasks
183183
-arch arm64
184-
-sign
185184
-pack
186185
-noBuildJava
187186
-noBuildNative
188-
/p:DotNetSignType=$(_SignType)
189187
/p:OnlyPackPlatformSpecificPackages=true
190188
$(_BuildArgs)
191189
$(_InternalRuntimeDownloadArgs)
@@ -208,23 +206,6 @@ extends:
208206
MSBUILDUSESERVER: "1"
209207
displayName: Build SiteExtension
210208

211-
# This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If
212-
# https://github.com/dotnet/arcade/issues/1957 is resolved, consider running code-signing inline with the other
213-
# previous steps. Sign check is disabled because it is run in a separate step below, after installers are built.
214-
- script: ./eng/build.cmd
215-
-ci
216-
-prepareMachine
217-
-noBuildRepoTasks
218-
-noBuildNative
219-
-noBuild
220-
-sign
221-
/p:DotNetSignType=$(_SignType)
222-
$(_BuildArgs)
223-
$(WindowsSignLogArgs)
224-
env:
225-
MSBUILDUSESERVER: "1"
226-
displayName: Code sign packages
227-
228209
# Windows installers bundle x86/x64/arm64 assets
229210
- script: ./eng/build.cmd
230211
-ci

‎.azure/pipelines/ci.yml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,9 @@ extends:
202202
-prepareMachine
203203
-noBuildRepoTasks
204204
-arch arm64
205-
-sign
206205
-pack
207206
-noBuildJava
208207
-noBuildNative
209-
/p:DotNetSignType=$(_SignType)
210208
/p:OnlyPackPlatformSpecificPackages=true
211209
$(_BuildArgs)
212210
$(_InternalRuntimeDownloadArgs)
@@ -228,23 +226,6 @@ extends:
228226
MSBUILDUSESERVER: "1"
229227
displayName: Build SiteExtension
230228

231-
# This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If
232-
# https://github.com/dotnet/arcade/issues/1957 is resolved, consider running code-signing inline with the other
233-
# previous steps. Sign check is disabled because it is run in a separate step below, after installers are built.
234-
- script: ./eng/build.cmd
235-
-ci
236-
-prepareMachine
237-
-noBuildRepoTasks
238-
-noBuildNative
239-
-noBuild
240-
-sign
241-
/p:DotNetSignType=$(_SignType)
242-
$(_BuildArgs)
243-
$(WindowsSignLogArgs)
244-
env:
245-
MSBUILDUSESERVER: "1"
246-
displayName: Code sign packages
247-
248229
# Windows installers bundle x86/x64/arm64 assets
249230
- script: ./eng/build.cmd
250231
-ci

‎eng/Version.Details.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ This file should be imported by eng/Versions.props
99
<dotnetefPackageVersion>10.0.0-rc.1.25420.121</dotnetefPackageVersion>
1010
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.0-rc.1.25420.121</MicrosoftBclAsyncInterfacesPackageVersion>
1111
<MicrosoftBclTimeProviderPackageVersion>10.0.0-rc.1.25420.121</MicrosoftBclTimeProviderPackageVersion>
12-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetArcadeSdkPackageVersion>
13-
<MicrosoftDotNetBuildTasksArchivesPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetBuildTasksArchivesPackageVersion>
14-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetBuildTasksInstallersPackageVersion>
15-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
16-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetHelixSdkPackageVersion>
17-
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetRemoteExecutorPackageVersion>
18-
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
12+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25454.102</MicrosoftDotNetArcadeSdkPackageVersion>
13+
<MicrosoftDotNetBuildTasksArchivesPackageVersion>11.0.0-beta.25454.102</MicrosoftDotNetBuildTasksArchivesPackageVersion>
14+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>11.0.0-beta.25454.102</MicrosoftDotNetBuildTasksInstallersPackageVersion>
15+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25454.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
16+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25454.102</MicrosoftDotNetHelixSdkPackageVersion>
17+
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.25454.102</MicrosoftDotNetRemoteExecutorPackageVersion>
18+
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.25454.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
1919
<MicrosoftEntityFrameworkCorePackageVersion>10.0.0-rc.1.25420.121</MicrosoftEntityFrameworkCorePackageVersion>
2020
<MicrosoftEntityFrameworkCoreDesignPackageVersion>10.0.0-rc.1.25420.121</MicrosoftEntityFrameworkCoreDesignPackageVersion>
2121
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>10.0.0-rc.1.25420.121</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
@@ -235,4 +235,4 @@ This file should be imported by eng/Versions.props
235235
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
236236
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildUtilitiesCorePackageVersion)</MicrosoftBuildUtilitiesCoreVersion>
237237
</PropertyGroup>
238-
</Project>
238+
</Project>

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -362,31 +362,31 @@
362362
<Uri>https://github.com/dotnet/dotnet</Uri>
363363
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
364364
</Dependency>
365-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25420.121">
365+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25454.102">
366366
<Uri>https://github.com/dotnet/dotnet</Uri>
367367
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
368368
</Dependency>
369-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25420.121">
369+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="11.0.0-beta.25454.102">
370370
<Uri>https://github.com/dotnet/dotnet</Uri>
371371
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
372372
</Dependency>
373-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25420.121">
373+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="11.0.0-beta.25454.102">
374374
<Uri>https://github.com/dotnet/dotnet</Uri>
375375
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
376376
</Dependency>
377-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25420.121">
377+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25454.102">
378378
<Uri>https://github.com/dotnet/dotnet</Uri>
379379
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
380380
</Dependency>
381-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25420.121">
381+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25454.102">
382382
<Uri>https://github.com/dotnet/dotnet</Uri>
383383
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
384384
</Dependency>
385-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25420.121">
385+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25454.102">
386386
<Uri>https://github.com/dotnet/dotnet</Uri>
387387
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
388388
</Dependency>
389-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25420.121">
389+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25454.102">
390390
<Uri>https://github.com/dotnet/dotnet</Uri>
391391
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
392392
</Dependency>
@@ -454,4 +454,4 @@
454454
</Dependency>
455455
<!-- End of manually updated dependencies -->
456456
</ToolsetDependencies>
457-
</Dependencies>
457+
</Dependencies>

‎eng/targets/BeforeWix.Common.targets‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<!-- Targets for making .wixproj better. -->
2+
<Project>
3+
<PropertyGroup Condition="'$(OutputType)' == 'package'">
4+
<EmbedCab Condition="'$(EmbedCab)' == ''">yes</EmbedCab>
5+
<InstallDir>$(ProductName)</InstallDir>
6+
7+
<DefineConstants Condition="'$(Configuration)' == 'Debug'">$(DefineConstants);Debug</DefineConstants>
8+
<DefineConstants>$(DefineConstants);EmbedCab=$(EmbedCab)</DefineConstants>
9+
</PropertyGroup>
10+
11+
<PropertyGroup Condition=" '$(OutputType)' == 'package' AND '$(Cabinet)' == '' ">
12+
<Cabinet>$(OutputName.Replace('-', '_')).cab</Cabinet>
13+
<Cabinet Condition=" '$(EmbedCab)' != 'yes' ">$(OutputName.Replace('_win', '')).cab</Cabinet>
14+
</PropertyGroup>
15+
16+
<PropertyGroup>
17+
<Culture Condition=" '$(Culture)' == '' ">en-US</Culture>
18+
<Cultures Condition=" '$(Cultures)' == '' ">$(Culture)</Cultures>
19+
<InstallerPlatform>$(Platform)</InstallerPlatform>
20+
<OutDir Condition=" '$(OutDir)' == '' ">$(OutputPath)</OutDir>
21+
22+
<DefineConstants>$(DefineConstants);Cabinet=$(Cabinet)</DefineConstants>
23+
<DefineConstants>$(DefineConstants);BinPath=$(OutputPath)$(Culture)\</DefineConstants>
24+
<DefineConstants>$(WixVariables);$(DefineConstants)</DefineConstants>
25+
</PropertyGroup>
26+
</Project>

‎eng/targets/Wix.Common.props‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33

44
<PropertyGroup>
55
<SchemaVersion>2.0</SchemaVersion>
6-
<ProductVersion>3.14</ProductVersion>
7-
<WixVersion>$(MicrosoftSignedWixVersion)</WixVersion>
86
</PropertyGroup>
97

108
<PropertyGroup>
9+
<CustomBeforeWixTargets>$(MSBuildThisFileDirectory)BeforeWix.Common.targets</CustomBeforeWixTargets>
1110
<TargetFrameworkMoniker>Native,Version=v0.0</TargetFrameworkMoniker>
1211

1312
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
@@ -17,10 +16,15 @@
1716
<NuGetRestoreTargets Condition="'$(NuGetRestoreTargets)'==''">$(MSBuildToolsPath)\NuGet.targets</NuGetRestoreTargets>
1817
</PropertyGroup>
1918

20-
<Import Project="$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).*.props" Condition="'$(_ProjectExtensionsWereImported)' != 'true'" />
21-
2219
<ItemGroup>
23-
<PackageReference Include="Microsoft.Signed.Wix" Version="$(WixVersion)" />
20+
<!-- Microsoft.Wix is a dotnet tool package, so exlude its assets. -->
21+
<PackageReference Include="Microsoft.Wix" Version="$(MicrosoftWixToolsetSdkVersion)" ExcludeAssets="all" />
22+
<!-- Installers needs the $(PkgMicrosoftWixToolsetUIwixext) property to locate the extension. -->
23+
<PackageReference Include="Microsoft.WixToolset.UI.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
24+
<PackageReference Include="Microsoft.WixToolset.Dependency.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
25+
<PackageReference Include="Microsoft.WixToolset.Util.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
26+
<PackageReference Include="Microsoft.WixToolset.Bal.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
27+
<PackageReference Include="Microsoft.WixToolset.Heat" Version="$(MicrosoftWixToolsetSdkVersion)" />
2428
</ItemGroup>
2529

2630
<PropertyGroup>

‎eng/targets/Wix.Common.targets‎

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,4 @@
1-
<!-- Targets for making .wixproj better. -->
21
<Project>
3-
4-
<ItemDefinitionGroup>
5-
<!-- Override the MicroBuild default certs which still uses MicrosoftSHA1 and Microsoft401 -->
6-
<SignCabs>
7-
<Authenticode>Microsoft400</Authenticode>
8-
</SignCabs>
9-
<SignMsi>
10-
<Authenticode>Microsoft400</Authenticode>
11-
</SignMsi>
12-
<SignBundle>
13-
<Authenticode>Microsoft400</Authenticode>
14-
</SignBundle>
15-
<SignBundleEngine>
16-
<Authenticode>Microsoft400</Authenticode>
17-
</SignBundleEngine>
18-
</ItemDefinitionGroup>
19-
20-
<PropertyGroup Condition="'$(OutputType)' == 'package'">
21-
<!-- Set package version for SharedFx & TargetingPack wixproj's -->
22-
<!-- Everything built in those projects _except_ the final package & MSI are shipping assets. -->
23-
<_GeneratedPackageVersion>$(PackageVersion)</_GeneratedPackageVersion>
24-
<_GeneratedPackageVersion
25-
Condition="! $(PackageVersion.Contains('$(_BuildNumberLabels)'))">$(VersionPrefix)-$(_PreReleaseLabel)$(_BuildNumberLabels)</_GeneratedPackageVersion>
26-
<!-- Insert PackageVersion into OutputName for SharedFx & TargetingPack -->
27-
<OutputName Condition="'$(OutputNamePrefix)' != '' AND '$(OutputNameSuffix)' != ''">$(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix)</OutputName>
28-
29-
<EmbedCab Condition="'$(EmbedCab)' == ''">yes</EmbedCab>
30-
<InstallDir>$(ProductName)</InstallDir>
31-
32-
<DefineConstants Condition="'$(Configuration)' == 'Debug'">$(DefineConstants);Debug</DefineConstants>
33-
<DefineConstants>$(DefineConstants);EmbedCab=$(EmbedCab)</DefineConstants>
34-
</PropertyGroup>
35-
36-
<PropertyGroup Condition=" '$(OutputType)' == 'package' AND '$(Cabinet)' == '' ">
37-
<Cabinet>$(OutputName.Replace('-', '_')).cab</Cabinet>
38-
<Cabinet Condition=" '$(EmbedCab)' != 'yes' ">$(OutputName.Replace('_win', '')).cab</Cabinet>
39-
</PropertyGroup>
40-
41-
<PropertyGroup>
42-
<Culture Condition=" '$(Culture)' == '' ">en-US</Culture>
43-
<Cultures Condition=" '$(Cultures)' == '' ">$(Culture)</Cultures>
44-
<InstallerPlatform>$(Platform)</InstallerPlatform>
45-
<OutDir Condition=" '$(OutDir)' == '' ">$(OutputPath)</OutDir>
46-
47-
<DefineConstants>$(DefineConstants);Cabinet=$(Cabinet)</DefineConstants>
48-
<DefineConstants>$(DefineConstants);BinPath=$(OutputPath)$(Culture)\</DefineConstants>
49-
<DefineConstants>$(WixVariables);$(DefineConstants)</DefineConstants>
50-
</PropertyGroup>
51-
52-
<Import Project="$(NuGetRestoreTargets)" />
53-
<Import Project="$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).*.targets" />
54-
<Import Project="$(WixTargetsPath)" Condition="'$(WixTargetsPath)' != '' " />
552
<!-- Don't import the Microbuild signing targets when post build sign is enabled. They override the
563
standard Wix targets for signing, and call ESRP directly (rather than through SignTool). So without this,
574
ASPNetCore will sign even when PostbuildSign == true -->

‎eng/tools/GenerateFiles/Directory.Build.props.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
<ArtifactsShippingPackagesDir>${ArtifactsShippingPackagesDir}</ArtifactsShippingPackagesDir>
55
<TreatWarningsAsErrors Condition="'$(BuildingInsideVisualStudio)' != 'true'">true</TreatWarningsAsErrors>
66
<LibNetHostAppPackVersion Condition=" '$(LibNetHostAppPackVersion)' == '' ">${LibNetHostAppPackVersion}</LibNetHostAppPackVersion>
7+
<_ProductVersionForInstallers>${MicrosoftAspNetCoreAppRuntimeVersion}</_ProductVersionForInstallers>
78
</PropertyGroup>
89
</Project>

‎global.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@
3232
"jdk": "latest"
3333
},
3434
"msbuild-sdks": {
35-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.121",
36-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.121",
37-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25420.121",
35+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25454.102",
36+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25454.102",
37+
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25454.102",
3838
"Microsoft.Build.NoTargets": "3.7.0",
39-
"Microsoft.Build.Traversal": "3.4.0"
39+
"Microsoft.Build.Traversal": "3.4.0",
40+
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"
4041
}
4142
}

‎src/Framework/App.Runtime/bundle/DotNetLogo_256x.png‎

2.1 KB
Loading

0 commit comments

Comments
 (0)