Update Asp.Net FrameworkReference in BrowserRefresh (#35282)

dotnet · Sep 12, 2023 · b22cea5 · b22cea5
1 parent d0b5cec
commit b22cea5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
@@ -9,11 +9,6 @@
     <UsagePattern IdentityGlob="Nuget.*/*" />
     <UsagePattern IdentityGlob="Microsoft.Build.NuGetSdkResolver/*" />
 
-    <!-- TODO: Figure out what to do about the netcoreapp ref packages (these are probably being pulled
-         in via implicit versions and net6 targeting projects (e.g. tests)
-         https://github.com/dotnet/source-build/issues/3356 -->
-    <UsagePattern IdentityGlob="Microsoft.*.App.Ref/*6.0*" />
-
     <!-- These are coming in transitively from verious repos (aspnetcore & format). Needs evaluation.
          https://github.com/dotnet/source-build/issues/3358. -->
     <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.0*" />

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -335,9 +335,9 @@
       <Sha>f379c3367804237751f13311b5dddbfafc86be40</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23457.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23461.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>18302345498a62222dd3c236b3d1d140dbaed43d</Sha>
+      <Sha>264d80ed1ee84b458328b2df68f9930deac08bff</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="1.0.0-preview.6.23407.1">

diff --git a/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj b/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj
@@ -14,4 +14,14 @@
     <EmbeddedResource Include="BlazorHotReload.js" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
+    <!-- Reference 6.0.2 targeting packs in Source Build - this was the earliest version after the API surface stabilized -->
+    <FrameworkReference
+      Update="Microsoft.AspNetCore.App"
+      TargetingPackVersion="6.0.2" />
+    <FrameworkReference
+      Update="Microsoft.NETCore.App"
+      TargetingPackVersion="6.0.2" />
+  </ItemGroup>
+
 </Project>