Skip to content

Commit e4ac69a

Browse files
author
Mirroring
committed
Merge commit '2651bb9970f1804cbc72f025da8c0f8e4de5e3ee'
2 parents 74acf9e + 2651bb9 commit e4ac69a

File tree

8 files changed

+33
-17
lines changed

8 files changed

+33
-17
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -376,26 +376,26 @@
376376
<Uri>https://github.com/dotnet/winforms</Uri>
377377
<Sha>abda8e3bfa78319363526b5a5f86863ec979940e</Sha>
378378
</Dependency>
379-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24426.2">
379+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24504.2">
380380
<Uri>https://github.com/dotnet/arcade</Uri>
381-
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
381+
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
382382
<SourceBuild RepoName="arcade" ManagedOnly="true" />
383383
</Dependency>
384-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24426.2">
384+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24504.2">
385385
<Uri>https://github.com/dotnet/arcade</Uri>
386-
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
386+
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
387387
</Dependency>
388-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24426.2">
388+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24504.2">
389389
<Uri>https://github.com/dotnet/arcade</Uri>
390-
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
390+
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
391391
</Dependency>
392-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24426.2">
392+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24504.2">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
394+
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
395395
</Dependency>
396-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24426.2">
396+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24504.2">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
398+
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
399399
</Dependency>
400400
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="8.1.0-preview.23604.1">
401401
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@
162162
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
163163
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
164164
<!-- Packages from dotnet/arcade -->
165-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24426.2</MicrosoftDotNetBuildTasksInstallersVersion>
166-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24426.2</MicrosoftDotNetBuildTasksTemplatingVersion>
167-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24426.2</MicrosoftDotNetRemoteExecutorVersion>
165+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24504.2</MicrosoftDotNetBuildTasksInstallersVersion>
166+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24504.2</MicrosoftDotNetBuildTasksTemplatingVersion>
167+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24504.2</MicrosoftDotNetRemoteExecutorVersion>
168168
<!-- Packages from dotnet/source-build-externals -->
169169
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.24379.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
170170
<!-- Packages from dotnet/source-build-reference-packages -->

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.19",
30-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24426.2",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24426.2"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24504.2",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24504.2"
3232
}
3333
}

‎src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
2+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
3+
xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
34
<Bundle Name="$(var.BundleName)" Version="$(var.BundleVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.BundleUpgradeCode)">
45
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
56
<bal:WixStandardBootstrapperApplication LicenseUrl="https://go.microsoft.com/fwlink/?LinkId=329770"
@@ -11,6 +12,10 @@
1112
<PayloadGroupRef Id="PG_Resources"/>
1213
</BootstrapperApplicationRef>
1314

15+
<util:RegistrySearchRef Id="RemovePreviousVersionRegistryKeySearch"/>
16+
<util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeyExistsSearch"/>
17+
<util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeySearch"/>
18+
1419
<!-- Ensure upgrades from 3.0.0 preview 1, 2, and 3. Conditioned for the 3.0.0 family. -->
1520
<?if $(var.Version)=3.0.0.0?>
1621
<?if $(var.Platform)=x86?>

‎src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16+
<WixExtension Include="WixUtilExtension">
17+
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
18+
<Name>WixUtilExtension</Name>
19+
</WixExtension>
1620
<WixExtension Include="WixDependencyExtension">
1721
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
1822
<Name>WixDependencyExtension</Name>
@@ -25,6 +29,7 @@
2529

2630
<ItemGroup>
2731
<Compile Include="Bundle.wxs" />
32+
<Compile Include="$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle\upgradePolicies.wxs" />
2833
<Content Include="thm.xml" />
2934
</ItemGroup>
3035

‎src/Installers/Windows/WindowsHostingBundle/Bundle.wxs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
<PayloadGroupRef Id="PG_Resources"/>
1414
</BootstrapperApplicationRef>
1515

16+
<!-- Search references for upgrade policy keys -->
17+
<util:RegistrySearchRef Id="RemovePreviousVersionRegistryKeySearch"/>
18+
<util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeyExistsSearch"/>
19+
<util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeySearch"/>
20+
1621
<!-- Ensure upgrades from 3.0.0 preview 1 and 2 (Preview 3 was not shipped). Conditioned for the 3.0.0 family. Hosting bundle simships x86/x64 so there's
1722
a single set of upgrade codes. -->
1823
<?if $(var.Version)=3.0.0.0?>

‎src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<Compile Include="Bundle.wxs" />
3737
<Compile Include="DotNetCore.wxs" />
3838
<Compile Include="SharedFramework.wxs" />
39+
<Compile Include="$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle\upgradePolicies.wxs" />
3940
</ItemGroup>
4041

4142
<ItemGroup>

‎src/Installers/Windows/Wix.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
NoLogo="true"
111111
Cultures="en-us"
112112
InstallerFile="%(WixInstallerFilesToProcess.Identity)"
113-
AdditionalBasePaths="$(MSBuildProjectDirectory)"
113+
AdditionalBasePaths="$(MSBuildProjectDirectory);$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle"
114114
WixExtensions="@(WixExtension)"
115115
Loc="@(EmbeddedResource)"
116116
Sice="$(SuppressIces)"

0 commit comments

Comments
 (0)