Start flowing Microsoft.NETCore.App (dotnet#24407)

bricelam · May 4, 2021 · afb7a04 · afb7a04
1 parent 23343b1
commit afb7a04
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 1 deletion.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,5 +1,12 @@
 <Project>
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
+  <ItemGroup>
+    <FrameworkReference Update="Microsoft.NETCore.App"
+                        Condition="'$(TargetFramework)' == 'net6.0'"
+                        RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
+                        TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
+  </ItemGroup>
 
   <Target Name="GetCustomAssemblyAttributes"
           BeforeTargets="GetAssemblyAttributes"

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -37,6 +37,19 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>3782e6e41cfaf76ec9ae4117722f835596026b1a</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.5.21226.1">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>3782e6e41cfaf76ec9ae4117722f835596026b1a</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.5.21226.1">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>3782e6e41cfaf76ec9ae4117722f835596026b1a</Sha>
+    </Dependency>
+    <!-- NB: Using BrowserDebugHost to represent the nonshipping version of Microsoft.NETCore.App -->
+    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-preview.5.21226.1">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>3782e6e41cfaf76ec9ae4117722f835596026b1a</Sha>
+    </Dependency>
     <Dependency Name="System.Collections.Immutable" Version="6.0.0-preview.5.21226.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>3782e6e41cfaf76ec9ae4117722f835596026b1a</Sha>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -27,6 +27,9 @@
     <MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.5.21226.1</MicrosoftExtensionsDependencyModelVersion>
     <MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-preview.5.21226.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
     <MicrosoftExtensionsLoggingVersion>6.0.0-preview.5.21226.1</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftNETCoreAppRefVersion>6.0.0-preview.5.21226.1</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.5.21226.1</MicrosoftNETCoreAppRuntimewinx64Version>
+    <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-preview.5.21226.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
   </PropertyGroup>
   <PropertyGroup Label="Other dependencies">
     <MicrosoftCodeAnalysisVersion>3.7.0</MicrosoftCodeAnalysisVersion>

diff --git a/eng/helix.proj b/eng/helix.proj
@@ -26,6 +26,12 @@
     <HelixBuild>t001</HelixBuild>
   </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
@@ -4,7 +4,8 @@
     "runtimes": {
       "dotnet": [
         "3.1.14",
-        "5.0.5"
+        "5.0.5",
+        "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
       ],
       "aspnetcore": [
         "3.1.14",