diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a298497681e..bd892bf0104d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,6 +321,10 @@ https://github.com/dotnet/arcade f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 + + https://github.com/dotnet/arcade + f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 + https://github.com/dotnet/arcade f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 diff --git a/eng/Versions.props b/eng/Versions.props index cf7150c0602b..2c8a857a5cc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,6 +143,9 @@ 5.0.0-rc.1.20431.2 5.0.0-rc.1.20431.2 5.0.0-rc.1.20431.2 + + + 5.0.0-beta.20427.5 + + + + + + + + diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props index c9b7565fe873..b3ad64d7ada4 100644 --- a/src/Installers/Windows/Wix.props +++ b/src/Installers/Windows/Wix.props @@ -28,4 +28,12 @@ $(RepoRoot)\src\Installers\Windows\GenerateNugetPackageWithMsi.ps1 + + + + $(ArtifactsObjDir)/WixCommandPackages + + $(ArtifactsNonShippingPackagesDir) + + diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index 17b41491fafc..ec321d4c41a6 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -24,6 +24,18 @@ $(Version);$(Platform);$(VersionSuffix);$(_BuildNumberLabels) + + + + + + $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\netcoreapp2.0\Microsoft.DotNet.Build.Tasks.Installers.dll + $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll + + + + + @@ -72,4 +84,27 @@ + + + + + + + + +