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

Merge pull request #5581 from mmitche/update-implicit-package-versions-master

Browse source 
[master] Update implicit package versions for 2.2.7 and 2.1.14 (#5566)
This commit is contained in:
Nick Guerrera 2019-11-08 15:04:01 -08:00 • committed by GitHub
commit 094772592c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/redist/targets/GenerateBundledVersions.targets
View file

@ -106,28 +106,28 @@
<ImplicitPackageVariable Include="Microsoft.NETCore.App" <ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.1" TargetFrameworkVersion="2.1"
DefaultVersion="2.1.0" DefaultVersion="2.1.0"
LatestVersion="2.1.13" /> LatestVersion="2.1.14" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App" <ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.2" TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0" DefaultVersion="2.2.0"
LatestVersion="2.2.7" /> LatestVersion="2.2.8" />
<ImplicitPackageVariable Include="Microsoft.AspNetCore.App" <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
TargetFrameworkVersion="2.1" TargetFrameworkVersion="2.1"
DefaultVersion="2.1.1" DefaultVersion="2.1.1"
LatestVersion="2.1.13"/> LatestVersion="2.1.14"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.All" <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
TargetFrameworkVersion="2.1" TargetFrameworkVersion="2.1"
DefaultVersion="2.1.1" DefaultVersion="2.1.1"
LatestVersion="2.1.13"/> LatestVersion="2.1.14"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.App" <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
TargetFrameworkVersion="2.2" TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0" DefaultVersion="2.2.0"
LatestVersion="2.2.7"/> LatestVersion="2.2.8"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.All" <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
TargetFrameworkVersion="2.2" TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0" DefaultVersion="2.2.0"
LatestVersion="2.2.7"/> LatestVersion="2.2.8"/>
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>

11
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs
View file

@ -145,6 +145,17 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
psi.Environment["DOTNET_MULTILEVEL_LOOKUP"] = "0"; psi.Environment["DOTNET_MULTILEVEL_LOOKUP"] = "0";
psi.Environment["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1"; psi.Environment["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1";
// Set DOTNET_ROOT to ensure sub process find the same host fxr
string dotnetDirectoryPath = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest);
if (System.Environment.Is64BitProcess)
{
psi.Environment.Add("DOTNET_ROOT", dotnetDirectoryPath);
}
else
{
psi.Environment.Add("DOTNET_ROOT(x86)", dotnetDirectoryPath);
}
AddEnvironmentVariablesTo(psi); AddEnvironmentVariablesTo(psi);
AddWorkingDirectoryTo(psi); AddWorkingDirectoryTo(psi);