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

Commit 2e0ae6d

Browse files
Redirect default install location in test to avoid using machine-wide install (#9230)
* Redirect default install location in test to avoid using machine-wide install * Updated windows build image to Windows.10.vs2019.amd64 Co-authored-by: Sean Reeser <[email protected]>
1 parent 2e6e595 commit 2e0ae6d

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,6 @@ stages:
169169
dependsOn: PrepareSignedArtifacts
170170
pool:
171171
name: NetCore1ESPool-Svc-Internal
172-
demands: ImageOverride -equals build.windows.10.amd64.vs2017
172+
demands: ImageOverride -equals Windows.10.vs2019.amd64
173173

174174
- template: /eng/stages/publish.yml

eng/jobs/prepare-signed-artifacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
dependsOn: ${{ parameters.dependsOn }}
99
pool:
1010
name: NetCore1ESPool-Svc-Internal
11-
demands: ImageOverride -equals build.windows.10.amd64.vs2017
11+
demands: ImageOverride -equals Windows.10.vs2019.amd64
1212
# Double the default timeout.
1313
timeoutInMinutes: 120
1414
workspace:

eng/jobs/windows-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
# Use a hosted pool when possible.
1515
${{ if eq(variables['System.TeamProject'], 'public') }}:
1616
name: NetCore-Svc-Public
17-
demands: ImageOverride -equals build.windows.10.amd64.vs2017.open
17+
demands: ImageOverride -equals Windows.10.vs2019.amd64.open
1818
${{ if ne(variables['System.TeamProject'], 'public') }}:
1919
name: NetCore1ESPool-Svc-Internal
20-
demands: ImageOverride -equals build.windows.10.amd64.vs2017
20+
demands: ImageOverride -equals Windows.10.vs2019.amd64
2121
strategy:
2222
matrix:
2323
debug:

src/test/HostActivation.Tests/FrameworkResolution/MultipleHives.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ private CommandResult RunTest(Func<RuntimeConfig, RuntimeConfig> runtimeConfig)
7979
SharedState.FrameworkReferenceApp,
8080
new TestSettings()
8181
.WithRuntimeConfigCustomizer(runtimeConfig)
82-
.WithEnvironment(Constants.TestOnlyEnvironmentVariables.GloballyRegisteredPath, SharedState.DotNetGlobalHive.BinPath),
82+
.WithEnvironment(Constants.TestOnlyEnvironmentVariables.GloballyRegisteredPath, SharedState.DotNetGlobalHive.BinPath)
83+
.WithEnvironment( // Redirect the default install location to an invalid location so that a machine-wide install is not used
84+
Constants.TestOnlyEnvironmentVariables.DefaultInstallPath,
85+
System.IO.Path.Combine(SharedState.DotNetMainHive.BinPath, "invalid")),
8386
// Must enable multi-level lookup otherwise multiple hives are not enabled
8487
multiLevelLookup: true);
8588
}

0 commit comments

Comments
 (0)