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

[release/3.1.1xx] Update dependencies from dotnet/toolset (#4797)

Browse source 
* Update dependencies from https://github.com/dotnet/toolset build 20190924.3

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19474.3

Dependency coherency updates

- Microsoft.NET.Sdk - 3.1.100-preview1.19463.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19474.2 (parent: Microsoft.Dotnet.Toolset.Internal)

* Override PATH to let razor find stage2 dotnet
This commit is contained in:
dotnet-maestro[bot] 2019-09-24 13:59:39 -07:00 • committed by William Li
parent 76a361bbf8
commit 0cc95ac36c
3 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -42,17 +42,17 @@
<Uri>https://github.com/dotnet/templating</Uri> <Uri>https://github.com/dotnet/templating</Uri>
<Sha>e8d6da33000a416b2b36b4f04b1756dcc99f671d</Sha> <Sha>e8d6da33000a416b2b36b4f04b1756dcc99f671d</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.100-preview1.19462.27"> <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.100-preview1.19474.3">
<Uri>https://github.com/dotnet/toolset</Uri> <Uri>https://github.com/dotnet/toolset</Uri>
<Sha>a8d3527fb2816d377ffabda05fb43b34bb1635db</Sha> <Sha>ab601116c06e74e7183920e69bc5251fe2b18d10</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc2.19455.7" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal"> <Dependency Name="Microsoft.NET.Sdk" Version="3.1.100-preview1.19463.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>b88161ed99ded0dd598779ad1afe044818422a6f</Sha> <Sha>a19b734139ab62de631c31897b0ffc35f8462f3f</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.100-preview1.19462.8" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.100-preview1.19474.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/cli</Uri> <Uri>https://github.com/dotnet/cli</Uri>
<Sha>25e58e48c0f49360bb5a9c804ca3b2ebeae01246</Sha> <Sha>4a9e195d7123e1c3d774cf8e6881d3ff93f47c44</Sha>
</Dependency> </Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup --> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.1-preview1.19462.8" CoherentParentDependency="Microsoft.WindowsDesktop.App"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.1-preview1.19462.8" CoherentParentDependency="Microsoft.WindowsDesktop.App">

6
eng/Versions.props
View file

@ -12,7 +12,7 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel> <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.1.100-preview1.19462.27</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>3.1.100-preview1.19474.3</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->
@ -33,14 +33,14 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli --> <!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.100-preview1.19462.8</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.100-preview1.19474.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk (to run tests) --> <!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
<MicrosoftNETSdkPackageVersion>3.0.100-rc2.19455.7</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>3.1.100-preview1.19463.2</MicrosoftNETSdkPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>

8
test/EndToEnd/ProjectBuildTests.cs
View file

@ -143,10 +143,12 @@ namespace EndToEnd.Tests
.Execute(restoreArgs) .Execute(restoreArgs)
.Should().Pass(); .Should().Pass();
var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest);
new BuildCommand() new BuildCommand()
.WithWorkingDirectory(projectDirectory) .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet
.Execute() .WithWorkingDirectory(projectDirectory)
.Should().Pass(); .Execute()
.Should().Pass();
} }
} }
} }