Fix downloading razor compiler from branch/PR (#68)

Author: jjonescz

Directory.Packages.props

@@ -4,7 +4,7 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     <!-- We are not using package source mapping. -->
     <NoWarn>$(NoWarn);NU1507</NoWarn>
-    <NetCoreVersion>10.0.0-preview.4.25252.106</NetCoreVersion>
+    <NetCoreVersion>10.0.0-preview.4.25258.110</NetCoreVersion>
     <AspNetCoreVersion>$(NetCoreVersion)</AspNetCoreVersion>
     <RoslynVersion>5.0.0-1.25252.6</RoslynVersion>
     <FluentUIVersion>4.11.8</FluentUIVersion>

eng/CopyDotNetDTs.targets

@@ -1,5 +1,9 @@
 <Project>
 
+	<ItemGroup>
+		<Content Remove="**\*.d.ts" />
+	</ItemGroup>
+
 	<Target Name="CopyDotNetDTs" AfterTargets="ProcessFrameworkReferences">
 		<ItemGroup>
 			<_DotnetDTsPath Include="%(RuntimePack.PackageDirectory)\runtimes\browser-wasm\native\dotnet.d.ts" Condition="'%(RuntimePack.Identity)' == 'Microsoft.NETCore.App.Runtime.Mono.browser-wasm'" />

global.json

@@ -1,5 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.100-preview.4.25252.106"
+    "version": "10.0.100-preview.4.25258.110",
+    "workloadVersion": "10.0.100-preview.4.25263.1"
   }
 }

nuget.config

@@ -5,7 +5,6 @@
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
-    <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
   </packageSources>
   <packageSourceMapping>
     <clear />

src/Compiler/Compiler.cs

@@ -510,7 +510,11 @@ RazorProjectEngine createProjectEngine(IReadOnlyList<MetadataReference> referenc
                 {
                     b.SetRootNamespace("TestNamespace");
 
-                    b.Features.Add(RazorAccessors.CreateDefaultTypeNameFeature());
+                    if (RazorUtil.TryCreateDefaultTypeNameFeature(out var defaultTypeNameFeature))
+                    {
+                        b.Features.Add(defaultTypeNameFeature);
+                    }
+
                     b.Features.Add(new CompilationTagHelperFeature());
                     b.Features.Add(new DefaultMetadataReferenceFeature
                     {

src/Compiler/Utils.cs

@@ -94,6 +94,21 @@ private static Func<Action<object>, IRazorFeature> CreateConfigureRazorParserOpt
         };
     }
 
+    public static bool TryCreateDefaultTypeNameFeature([NotNullWhen(returnValue: true)] out RazorEngineFeatureBase? result)
+    {
+        if (typeof(RazorEngineFeatureBase).Assembly
+            .GetType("Microsoft.AspNetCore.Razor.Language.DefaultTypeNameFeature")?
+            .GetConstructor(Type.EmptyTypes)?
+            .Invoke(null) is RazorEngineFeatureBase feature)
+        {
+            result = feature;
+            return true;
+        }
+
+        result = null;
+        return false;
+    }
+
     public static void ConfigureRazorParserOptionsSafe(this RazorProjectEngineBuilder builder, Action<object> configure)
     {
         builder.Features.Add(configureRazorParserOptionsFactory.Value(configure));

src/RazorAccess/RazorAccessors.cs

@@ -1,17 +1,13 @@
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
 using Microsoft.NET.Sdk.Razor.SourceGenerators;
 using System.Runtime.CompilerServices;
 
 namespace DotNetLab;
 
 public static class RazorAccessors
 {
-    public static RazorEngineFeatureBase CreateDefaultTypeNameFeature()
-        => new DefaultTypeNameFeature();
-
     public static RazorProjectItem CreateSourceGeneratorProjectItem(
         string basePath,
         string filePath,

src/Worker/Lab/AzDoDownloader.cs

@@ -122,7 +122,7 @@ private async Task<ImmutableArray<LoadedAssembly>> GetAssembliesViaNupkgAsync(
             artifactName: artifactName,
             fileId: nupkg.Id);
 
-        return NuGetUtil.GetAssembliesFromNupkg(stream, folder: packageFolder);
+        return await NuGetUtil.GetAssembliesFromNupkgAsync(stream, folder: packageFolder);
     }
 
     private async Task<ImmutableArray<LoadedAssembly>> GetAssembliesViaRehydrateAsync(int buildId, string artifactName, ArtifactFiles files, HashSet<string> names)

src/Worker/Lab/NuGetDownloader.cs

@@ -10,10 +10,11 @@ namespace DotNetLab.Lab;
 
 public static class NuGetUtil
 {
-    internal static ImmutableArray<LoadedAssembly> GetAssembliesFromNupkg(Stream nupkgStream, string folder)
+    internal static async Task<ImmutableArray<LoadedAssembly>> GetAssembliesFromNupkgAsync(Stream nupkgStream, string folder)
     {
         const string extension = ".dll";
-        using var reader = new PackageArchiveReader(nupkgStream, leaveStreamOpen: true);
+        using var zipArchive = await ZipArchive.CreateAsync(nupkgStream, ZipArchiveMode.Read, leaveOpen: false, entryNameEncoding: null);
+        using var reader = new PackageArchiveReader(zipArchive);
         return reader.GetFiles()
             .Where(file =>
             {
@@ -173,7 +174,7 @@ public async Task<CompilerDependencyInfo> GetInfoAsync()
 
     public async Task<ImmutableArray<LoadedAssembly>> GetAssembliesAsync()
     {
-        return NuGetUtil.GetAssembliesFromNupkg(await GetStreamAsync(), folder: folder);
+        return await NuGetUtil.GetAssembliesFromNupkgAsync(await GetStreamAsync(), folder: folder);
     }
 }
 

test/UnitTests/CompilerProxyTests.cs

@@ -55,6 +55,8 @@ await services.GetRequiredService<CompilerDependencyProvider>()
     [InlineData("9.0.0-preview.24413.5")]
     [InlineData("9.0.0-preview.25128.1")]
     [InlineData("10.0.0-preview.25252.1")]
+    [InlineData("10.0.0-preview.25264.1")]
+    [InlineData("main")] // test that we can download a branch
     public async Task SpecifiedNuGetRazorVersion(string version)
     {
         var services = WorkerServices.CreateTest(new MockHttpMessageHandler(output));
@@ -113,7 +115,7 @@ public async Task SpecifiedRazorOptions(RazorToolchain toolchain, RazorStrategy
     }
 }
 
-internal sealed partial class MockHttpMessageHandler : HttpMessageHandler
+internal sealed partial class MockHttpMessageHandler : HttpClientHandler
 {
     private readonly ITestOutputHelper testOutput;
     private readonly string directory;
@@ -128,6 +130,12 @@ protected override Task<HttpResponseMessage> SendAsync(
         HttpRequestMessage request,
         CancellationToken cancellationToken)
     {
+        if (request.RequestUri?.Host != "localhost")
+        {
+            testOutput.WriteLine($"Skipping mocking non-localhost request: {request.RequestUri}");
+            return base.SendAsync(request, cancellationToken);
+        }
+
         testOutput.WriteLine($"Mocking request: {request.RequestUri}");
 
         if (UrlRegex.Match(request.RequestUri?.ToString() ?? "") is