diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 316f8b33b..b4ce8dc3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,7 +47,7 @@ https://github.com/aspnet/AspNetCore 80fec4e3edea3972e95885f5c0db6ee06072f917 - + https://github.com/aspnet/AspNetCore 80fec4e3edea3972e95885f5c0db6ee06072f917 diff --git a/eng/Versions.props b/eng/Versions.props index f463a8fa0..a1afd785c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ 3.1.0-preview3.19555.2 3.1.0-preview3.19555.2 - 3.1.0-preview3.19555.2 + 3.1.0-preview3.19555.2 3.1.0-preview3.19555.2 3.1.0-preview3.19555.2 3.1.0-preview3.19555.2 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 32eac3228..01d699be7 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -92,28 +92,28 @@ + LatestVersion="2.1.14" /> + LatestVersion="2.2.8" /> + LatestVersion="2.1.14"/> + LatestVersion="2.1.14"/> + LatestVersion="2.2.8"/> + LatestVersion="2.2.8"/> diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index e46c59629..832d732e0 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -11,7 +11,7 @@ - $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + $(VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion) $(MicrosoftNETCoreAppInternalPackageVersion) @@ -270,8 +270,7 @@ - $(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion) - $(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion) $(DownloadedAspNetTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs index a82872429..c25fcd533 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs @@ -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);