mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #115 from dsplaisted/insert-toolset

Browse source 
Insert updated toolset
This commit is contained in:
Daniel Plaisted 2018-10-19 09:35:03 -07:00 committed by GitHub
commit ef41900e2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/DependencyVersions.props
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ToolsetVersion>3.0.100-alpha1-009555</ToolsetVersion>
<ToolsetVersion>3.0.100-alpha1-009562</ToolsetVersion>
</PropertyGroup>
<PropertyGroup>

6
build/MSBuildExtensions.targets
View file

@ -62,11 +62,11 @@
<ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="1.0"
DefaultVersion="1.0.5"
LatestVersion="1.0.12" />
LatestVersion="1.0.13" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="1.1"
DefaultVersion="1.1.2"
LatestVersion="1.1.9" />
LatestVersion="1.1.10" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.0"
DefaultVersion="2.0.0"
@ -156,6 +156,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<KnownFrameworkReference Include="Microsoft.DesktopUI"
TargetFramework="netcoreapp3.0"
RuntimeFrameworkName="Microsoft.DesktopUI.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftDesktopUIPackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftDesktopUIPackageVersion)"
@ -164,6 +165,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/>
<KnownFrameworkReference Include="Microsoft.AspNetCore"
TargetFramework="netcoreapp3.0"
RuntimeFrameworkName="Microsoft.AspNetCore.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"

13
test/EndToEnd/GivenDotNetUsesMSBuild.cs
View file

@ -37,11 +37,16 @@ namespace Microsoft.DotNet.Tests.EndToEnd
.Execute()
.Should().Pass();
new RunCommand()
.WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput()
var runCommand = new RunCommand()
.WithWorkingDirectory(projectDirectory);
// Set DOTNET_ROOT as workaround for https://github.com/dotnet/cli/issues/10196
runCommand = runCommand.WithEnvironmentVariable(Environment.Is64BitProcess ? "DOTNET_ROOT" : "DOTNET_ROOT(x86)",
Path.GetDirectoryName(DotnetUnderTest.FullName));
runCommand.ExecuteWithCapturedOutput()
.Should().Pass()
.And.HaveStdOutContaining("Hello World!");
.And.HaveStdOutContaining("Hello World!");
var binDirectory = new DirectoryInfo(projectDirectory).Sub("bin");
binDirectory.Should().HaveFilesMatching("*.dll", SearchOption.AllDirectories);