More updates

Author: MackinnonBuck

src/Components/Shared/src/ResourceCollectionProvider.cs

@@ -7,6 +7,8 @@
 
 namespace Microsoft.AspNetCore.Components;
 
+using static Microsoft.AspNetCore.Internal.LinkerFlags;
+
 internal class ResourceCollectionProvider
 {
     private const string ResourceCollectionUrlKey = "__ResourceCollectionUrl";
@@ -52,6 +54,7 @@ internal void SetResourceCollection(ResourceAssetCollection resourceCollection)
         _resourceCollection = resourceCollection;
     }
 
+    [DynamicDependency(JsonSerialized, typeof(ResourceAsset))]
     private async Task<ResourceAssetCollection> LoadResourceCollection()
     {
         if (_url == null)

src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets

@@ -68,7 +68,6 @@
 
     <ItemGroup>
       <_ExistingFilesFromLastRun Include="$(TestTemplateCreationFolder)**\*" />
-      <!-- <_ExistingFilesFromLastRun Include="$(TemplateTestDotNetRoot)**\*" /> -->
     </ItemGroup>
 
     <Delete Files="@(_ExistingFilesFromLastRun)" ContinueOnError="true" />

src/Shared/CommandLineUtils/Utilities/DotNetMuxer.cs

@@ -9,6 +9,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 

src/Shared/test/Shared.Tests/DotNetMuxerTests.cs

@@ -14,28 +14,11 @@ public class DotNetMuxerTests
     [Fact]
     public void FindsTheMuxer()
     {
-
-        var muxerPath = DotNetMuxer.TryFindMuxerPath(GetDotnetPath());
+        var muxerPath = DotNetMuxer.MuxerPath;
         Assert.NotNull(muxerPath);
         Assert.True(File.Exists(muxerPath), "The file did not exist");
         Assert.True(Path.IsPathRooted(muxerPath), "The path should be rooted");
         Assert.Equal("dotnet", Path.GetFileNameWithoutExtension(muxerPath), ignoreCase: true);
-
-        static string GetDotnetPath()
-        {
-            // Process.MainModule is app[.exe] and not `dotnet`. We can instead calculate the dotnet SDK path
-            // by looking at the shared fx directory instead.
-            // depsFile = /dotnet/shared/Microsoft.NETCore.App/6.0-preview2/Microsoft.NETCore.App.deps.json
-            var depsFile = (string)AppContext.GetData("FX_DEPS_FILE");
-            return Path.GetFullPath(Path.Combine(Path.GetDirectoryName(depsFile), "..", "..", "..", "dotnet" + (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : "")));
-        }
-    }
-
-    [Fact]
-    public void ReturnsNullIfMainModuleIsNotDotNet()
-    {
-        var muxerPath = DotNetMuxer.TryFindMuxerPath(@"d:\some-path\testhost.exe");
-        Assert.Null(muxerPath);
     }
 }
 #endif