Add host tests for asset resolution behaviour without fallback graph #83434

elinor-fung · 2023-03-15T03:26:55Z

Add host tests for asset resolution behaviour without fallback graph
- Also merged the ComponentOnSelfContainedApp with/without a fallback graph into one test class
Refactor probe_config_t to hopefully make it clearer what each instance is for
Update tests to validate that a framework probe was used or not used

Slightly tweaked probe config logging:

before

-- Probe configurations:
probe_config_t: probe=[] deps-dir-probe=[1]
probe_config_t: probe=[C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8] deps-dir-probe=[0]

Processing TPA for deps entry [helloworld, 1.0.0, helloworld.dll]
  Considering entry [helloworld/1.0.0/helloworld.dll], probe dir [], probe fx level:0, entry fx level:0
    Local path query C:\repos\helloworld\bin\Debug\net8.0\helloworld.dll (skipped file existence check)
    Probed deps dir and matched 'C:\repos\helloworld\bin\Debug\net8.0\helloworld.dll'
Processing TPA for deps entry [Microsoft.NETCore.App.Runtime.win-x64, 8.0.0-preview.1.23110.8, System.Private.CoreLib.dll]
  Considering entry [Microsoft.NETCore.App.Runtime.win-x64/8.0.0-preview.1.23110.8/System.Private.CoreLib.dll], probe dir [], probe fx level:0, entry fx level:1
    Skipping... not found in deps dir 'C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8'
    Skipping... not found in probe dir ''
  Considering entry [Microsoft.NETCore.App.Runtime.win-x64/8.0.0-preview.1.23110.8/System.Private.CoreLib.dll], probe dir [C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8], probe fx level:1, entry fx level:1
    Local path query C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8\System.Private.CoreLib.dll (skipped file existence check)
    Probed deps json and matched 'C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8\System.Private.CoreLib.dll'

after

-- Probe configurations:
  probe type=app
  probe type=framework dir=[C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8] fx_level=1

Processing TPA for deps entry [helloworld, 1.0.0, helloworld.dll] with fx level: 0
  Using probe config: type=app
    Local path query C:\repos\helloworld\bin\Debug\net8.0\helloworld.dll (skipped file existence check)
    Probed deps dir and matched 'C:\repos\helloworld\bin\Debug\net8.0\helloworld.dll'
Processing TPA for deps entry [Microsoft.NETCore.App.Runtime.win-x64, 8.0.0-preview.1.23110.8, System.Private.CoreLib.dll] with fx level: 1
  Using probe config: type=app
    Skipping... not app asset
  Using probe config: type=framework dir=[C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8] fx_level=1
    Local path query C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8\System.Private.CoreLib.dll (skipped file existence check)
    Probed deps json and matched 'C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8\System.Private.CoreLib.dll'

ghost · 2023-03-15T03:27:04Z

Tagging subscribers to this area: @vitek-karas, @agocke, @VSadov
See info in area-owners.md if you want to be subscribed.

Issue Details

Add host tests for asset resolution behaviour without fallback graph
- Also merged the ComponentOnSelfContainedApp with/without a fallback graph into one test class
Refactor probe_config_t to hopefully make it clearer what each instance is for
Update tests to validate that a framework probe was used or not used

Slightly tweaked probe config logging:

before

-- Probe configurations:
probe_config_t: probe=[] deps-dir-probe=[1]
probe_config_t: probe=[C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8] deps-dir-probe=[0]

Processing TPA for deps entry [helloworld, 1.0.0, helloworld.dll]
  Considering entry [helloworld/1.0.0/helloworld.dll], probe dir [], probe fx level:0, entry fx level:0
    Local path query C:\repos\helloworld\bin\Debug\net8.0\helloworld.dll (skipped file existence check)
    Probed deps dir and matched 'C:\repos\helloworld\bin\Debug\net8.0\helloworld.dll'
Processing TPA for deps entry [Microsoft.NETCore.App.Runtime.win-x64, 8.0.0-preview.1.23110.8, System.Private.CoreLib.dll]
  Considering entry [Microsoft.NETCore.App.Runtime.win-x64/8.0.0-preview.1.23110.8/System.Private.CoreLib.dll], probe dir [], probe fx level:0, entry fx level:1
    Skipping... not found in deps dir 'C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8'
    Skipping... not found in probe dir ''
  Considering entry [Microsoft.NETCore.App.Runtime.win-x64/8.0.0-preview.1.23110.8/System.Private.CoreLib.dll], probe dir [C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8], probe fx level:1, entry fx level:1
    Local path query C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8\System.Private.CoreLib.dll (skipped file existence check)
    Probed deps json and matched 'C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8\System.Private.CoreLib.dll'

after

-- Probe configurations:
  probe type=app
  probe type=framework dir=[C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8] fx_level=1

Processing TPA for deps entry [helloworld, 1.0.0, helloworld.dll] with fx level: 0
  Using probe config: type=app
    Local path query C:\repos\helloworld\bin\Debug\net8.0\helloworld.dll (skipped file existence check)
    Probed deps dir and matched 'C:\repos\helloworld\bin\Debug\net8.0\helloworld.dll'
Processing TPA for deps entry [Microsoft.NETCore.App.Runtime.win-x64, 8.0.0-preview.1.23110.8, System.Private.CoreLib.dll] with fx level: 1
  Using probe config: type=app
    Skipping... not app asset
  Using probe config: type=framework dir=[C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8] fx_level=1
    Local path query C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8\System.Private.CoreLib.dll (skipped file existence check)
    Probed deps json and matched 'C:\dotnet-8\shared\Microsoft.NETCore.App\8.0.0-preview.1.23110.8\System.Private.CoreLib.dll'

Author:	elinor-fung
Assignees:	-
Labels:	`area-Host`
Milestone:	-

vitek-karas

LGTM - Thanks!

vitek-karas · 2023-03-15T14:25:23Z

src/installer/tests/HostActivation.Tests/DependencyResolution/RidAssetResolution.cs

@@ -40,102 +34,113 @@ protected RidAssetResolutionBase(SharedTestState sharedState)
        [InlineData("win10-x64", WindowsAssembly, $"{LinuxAssembly};{MacOSAssembly}")]
        [InlineData("linux-x64", LinuxAssembly, $"{MacOSAssembly};{WindowsAssembly}")]
        [InlineData("osx-x64", MacOSAssembly, $"{LinuxAssembly};{WindowsAssembly}")]
-        public void RidSpecificAssembly(string rid, string includedPath, string excludedPath)
+        public void RidSpecificAssembly(string rid, string includedPath, string excludedPath, bool hasRuntimeFallbacks = true)


Subjective - Presonally I would prefer to add a new method overload and call the "private" one from other places. I just don't like that a method is both a test and also called from another test.

elinor-fung · 2023-03-16T00:15:22Z

Failures are:

Add host tests for asset resolution behaviour without fallback graph

b5e5fa3

elinor-fung added the area-Host label Mar 15, 2023

elinor-fung requested a review from vitek-karas March 15, 2023 03:26

ghost assigned elinor-fung Mar 15, 2023

This was referenced Mar 15, 2023

Tracking issue for CI build timeouts #76454

Closed

Roslyn source generator crash on mono/linux/arm64 #81123

Closed

vitek-karas approved these changes Mar 15, 2023

View reviewed changes

elinor-fung added 2 commits March 15, 2023 11:20

PR feedback

b16b4ff

Merge branch 'main' into noFallbackTests

e868e8d

elinor-fung merged commit 7a3b4f6 into dotnet:main Mar 16, 2023

elinor-fung deleted the noFallbackTests branch March 16, 2023 00:15

build-analysis bot mentioned this pull request Mar 16, 2023

Crashes when initializing System.Net.Security.Native #83540

Closed

ghost locked as resolved and limited conversation to collaborators Apr 15, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add host tests for asset resolution behaviour without fallback graph #83434

Add host tests for asset resolution behaviour without fallback graph #83434

elinor-fung commented Mar 15, 2023

ghost commented Mar 15, 2023

vitek-karas left a comment

vitek-karas Mar 15, 2023

elinor-fung commented Mar 16, 2023

Add host tests for asset resolution behaviour without fallback graph #83434

Add host tests for asset resolution behaviour without fallback graph #83434

Conversation

elinor-fung commented Mar 15, 2023

ghost commented Mar 15, 2023

vitek-karas left a comment

Choose a reason for hiding this comment

vitek-karas Mar 15, 2023

Choose a reason for hiding this comment

elinor-fung commented Mar 16, 2023