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

Merge pull request #5577 from mmitche/merge-from-301xx

Browse source 
[release/3.1.1xx] Merge from release/3.0.1xx
This commit is contained in:
William Godbe 2019-11-11 09:40:09 -08:00 • committed by GitHub
commit 7826cd7dca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
eng/Version.Details.xml
View file

@ -47,7 +47,7 @@
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>80fec4e3edea3972e95885f5c0db6ee06072f917</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.0-preview3.19555.2">
<Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1" Version="3.1.0-preview3.19555.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>80fec4e3edea3972e95885f5c0db6ee06072f917</Sha>
</Dependency>

2
eng/Versions.props
View file

@ -38,7 +38,7 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.0-preview3.19555.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.1.0-preview3.19555.2</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.0-preview3.19555.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion>3.1.0-preview3.19555.2</VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion>
<dotnetdevcertsPackageVersion>3.1.0-preview3.19555.2</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.1.0-preview3.19555.2</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.1.0-preview3.19555.2</dotnetwatchPackageVersion>

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

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

5
src/redist/targets/GenerateLayout.targets
View file

@ -11,7 +11,7 @@
<PropertyGroup>
<!-- Blob storage directories are not stabilized, so these must refer to a package that does not stabilize -->
<AspNetCoreBlobVersion>$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)</AspNetCoreBlobVersion>
<AspNetCoreBlobVersion>$(VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion)</AspNetCoreBlobVersion>
<CoreSetupBlobVersion>$(MicrosoftNETCoreAppInternalPackageVersion)</CoreSetupBlobVersion>
<!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
@ -270,8 +270,7 @@
<BundledInstallerComponent Include="DownloadedAspNetTargetingPackInstallerFile"
Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
<BaseUrl Condition="'$(AspNetTargetingPackIsPinned)' == 'true'">$(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion)</BaseUrl>
<BaseUrl Condition="'$(AspNetTargetingPackIsPinned)' != 'true'">$(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion)</BaseUrl>
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion)</BaseUrl>
<DownloadFileName>$(DownloadedAspNetTargetingPackInstallerFileName)</DownloadFileName>
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
</BundledInstallerComponent>

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_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);
AddWorkingDirectoryTo(psi);