Flow Microsfot.NETCore.App

Fixes #31300
dotnet · Jul 18, 2023 · bdc0998 · bdc0998
1 parent fc9a3b9
commit bdc0998
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 1 deletion.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -2,6 +2,13 @@
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
   <Import Project="eng\testing\linker\trimmingTests.targets" Condition="'$(IsPublishedAppTestProject)' == 'true'" />
 
+  <ItemGroup>
+    <FrameworkReference Update="Microsoft.NETCore.App"
+                        Condition="'$(TargetFramework)' == 'net8.0'"
+                        RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
+                        TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
+  </ItemGroup>
+
   <Target Name="GetCustomAssemblyAttributes"
           BeforeTargets="GetAssemblyAttributes"
           Condition=" '$(MSBuildProjectExtension)' == '.csproj' "

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -41,6 +41,19 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>bb38848e9877dc0b43860dc219ebe36fc04a6bb3</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23364.11">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>bb38848e9877dc0b43860dc219ebe36fc04a6bb3</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.7.23364.11">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>bb38848e9877dc0b43860dc219ebe36fc04a6bb3</Sha>
+    </Dependency>
+    <!-- NB: Using BrowserDebugHost to represent the nonshipping version of Microsoft.NETCore.App -->
+    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.0-preview.7.23364.11">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>bb38848e9877dc0b43860dc219ebe36fc04a6bb3</Sha>
+    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23364.2">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -26,6 +26,9 @@
     <MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-preview.7.23364.11</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
     <MicrosoftExtensionsLoggingVersion>8.0.0-preview.7.23364.11</MicrosoftExtensionsLoggingVersion>
     <SystemTextJsonVersion>8.0.0-preview.7.23364.11</SystemTextJsonVersion>
+    <MicrosoftNETCoreAppRefVersion>8.0.0-preview.7.23364.11</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.7.23364.11</MicrosoftNETCoreAppRuntimewinx64Version>
+    <MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-preview.7.23364.11</MicrosoftNETCoreBrowserDebugHostTransportVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/arcade">
     <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23364.2</MicrosoftDotNetBuildTasksTemplatingVersion>

diff --git a/eng/helix.proj b/eng/helix.proj
@@ -24,6 +24,12 @@
     <MSSQL_SA_PASSWORD>Password12!</MSSQL_SA_PASSWORD>
   </PropertyGroup>
 
+  <ItemGroup>
+    <AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
+      <PackageType>runtime</PackageType>
+    </AdditionalDotNetPackage>
+  </ItemGroup>
+
   <ItemGroup>
     <XUnitProject Include="$(RepoRoot)/test/**/*.csproj"/>
     <XUnitProject Remove="$(RepoRoot)/test/EFCore.Specification.Tests/*.csproj"/>

diff --git a/global.json b/global.json
@@ -5,7 +5,12 @@
     "rollForward": "latestMajor"
   },
   "tools": {
-    "dotnet": "8.0.100-preview.7.23354.1"
+    "dotnet": "8.0.100-preview.7.23354.1",
+    "runtimes": {
+      "dotnet": [
+        "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
+      ]
+    }
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23364.2",