Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Commit

Permalink
Merge pull request #5581 from piotrpMSFT/piotrpmsft/bump/msbuild15.1.…
Browse files Browse the repository at this point in the history
…0-preview-000545-01

Update MSBuild
  • Loading branch information
Piotr Puszkiewicz committed Feb 4, 2017
2 parents 679b16e + 42f257d commit f7978d9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CLI_MSBuild_Version>15.1.0-preview-000544-02</CLI_MSBuild_Version>
<CLI_MSBuild_Version>15.1.0-preview-000545-01</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
<CLI_NETSDK_Version>1.0.0-alpha-20170201-18</CLI_NETSDK_Version>
<CLI_NuGet_Version>4.0.0-rtm-2259</CLI_NuGet_Version>
Expand Down
10 changes: 1 addition & 9 deletions build/package/Microsoft.DotNet.Cli.Installer.MSI.targets
Expand Up @@ -26,12 +26,6 @@
<SdkInstallerNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(NugetVersion).nupkg</SdkInstallerNupkgFile>
</PropertyGroup>

<!-- Generate SDK MSI Inputs -->
<ItemGroup>
<GenerateSdkMsiInputs Include="$(SdkLayoutOutputDirectory)/**/*;
$(SdkGenerateMsiPowershellScript)" />
</ItemGroup>

<!-- Consumed By Publish -->
<ItemGroup>
<GeneratedInstallers Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" />
Expand Down Expand Up @@ -80,9 +74,7 @@

<Target Name="GenerateSdkMsi"
DependsOnTargets="Init;Layout;AcquireWix;MsiTargetsSetupInputOutputs"
Condition=" '$(OS)' == 'Windows_NT'"
Inputs="@(GenerateSdkMsiInputs)"
Outputs="$(SdkInstallerFile)">
Condition=" '$(OS)' == 'Windows_NT'">

<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateMsiPowershellScript)
'$(SdkLayoutOutputDirectory)'
Expand Down

0 comments on commit f7978d9

Please sign in to comment.