Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Redirect default install location in test to avoid using machine-wide install #9230

Merged
merged 2 commits into from
Nov 16, 2022
Merged

Redirect default install location in test to avoid using machine-wide install #9230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9870a2b
Redirect default install location in test to avoid using machine-wide…
elinor-fung Nov 16, 2022
c0f5322
Updated windows build image to Windows.10.vs2019.amd64
vseanreesermsft Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,6 @@ stages:
dependsOn: PrepareSignedArtifacts
pool:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals build.windows.10.amd64.vs2017
demands: ImageOverride -equals Windows.10.vs2019.amd64

- template: /eng/stages/publish.yml
2 changes: 1 addition & 1 deletion eng/jobs/prepare-signed-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
dependsOn: ${{ parameters.dependsOn }}
pool:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals build.windows.10.amd64.vs2017
demands: ImageOverride -equals Windows.10.vs2019.amd64
# Double the default timeout.
timeoutInMinutes: 120
workspace:
Expand Down
4 changes: 2 additions & 2 deletions eng/jobs/windows-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
# Use a hosted pool when possible.
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Svc-Public
demands: ImageOverride -equals build.windows.10.amd64.vs2017.open
demands: ImageOverride -equals Windows.10.vs2019.amd64.open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals build.windows.10.amd64.vs2017
demands: ImageOverride -equals Windows.10.vs2019.amd64
strategy:
matrix:
debug:
Expand Down
5 changes: 4 additions & 1 deletion src/test/HostActivation.Tests/FrameworkResolution/MultipleHives.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@ private CommandResult RunTest(Func<RuntimeConfig, RuntimeConfig> runtimeConfig)
SharedState.FrameworkReferenceApp,
new TestSettings()
.WithRuntimeConfigCustomizer(runtimeConfig)
.WithEnvironment(Constants.TestOnlyEnvironmentVariables.GloballyRegisteredPath, SharedState.DotNetGlobalHive.BinPath),
.WithEnvironment(Constants.TestOnlyEnvironmentVariables.GloballyRegisteredPath, SharedState.DotNetGlobalHive.BinPath)
.WithEnvironment( // Redirect the default install location to an invalid location so that a machine-wide install is not used
Constants.TestOnlyEnvironmentVariables.DefaultInstallPath,
System.IO.Path.Combine(SharedState.DotNetMainHive.BinPath, "invalid")),
// Must enable multi-level lookup otherwise multiple hives are not enabled
multiLevelLookup: true);
}
Expand Down