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

Merge pull request #2034 from dsplaisted/update-toolset

Browse source 
Insert updated toolset
This commit is contained in:
Daniel Plaisted 2019-05-16 18:23:24 -07:00 • committed by GitHub
commit ff4d923ae5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -42,9 +42,9 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>5ec7cffdd20dc55fc5ff298ba9fd073c9b0296ac</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview6.19230.5">
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview6.19266.2">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>43bcfd562b4674194fc2dd62e1de5796296b6805</Sha>
<Sha>ddcf1c267ee1eb5f9f478c43dfc6e76dfea1abfa</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19265.2">
<Uri>https://github.com/dotnet/standard</Uri>

2
eng/Versions.props
View file

@ -12,7 +12,7 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview6.19230.5</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview6.19266.2</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

3
test/EndToEnd/ProjectBuildTests.cs
View file

@ -111,7 +111,8 @@ namespace EndToEnd.Tests
[InlineData("mstest")]
[InlineData("nunit")]
[InlineData("web")]
[InlineData("mvc")]
// Disable mvc template due to https://github.com/aspnet/AspNetCore/issues/10218
// [InlineData("mvc")]
public void ItCanBuildTemplates(string templateName)
{
TestTemplateBuild(templateName);