Start flowing Microsoft.NETCore.App dependency

dotnet · Aug 27, 2020 · 327deb3 · 327deb3
1 parent a57d2e5
commit 327deb3
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DefaultNetCoreTargetFramework>netcoreapp5.0</DefaultNetCoreTargetFramework>
+    <DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,3 +1,10 @@
 <Project>
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
+  <ItemGroup>
+    <FrameworkReference Update="Microsoft.NETCore.App"
+                        Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'"
+                        RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)"
+                        TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)" />
+  </ItemGroup>
 </Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -37,6 +37,14 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>ba5b5d18915eb637e53719373b857a2a310c204f</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.1.20427.3">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>ba5b5d18915eb637e53719373b857a2a310c204f</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20427.3">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>ba5b5d18915eb637e53719373b857a2a310c204f</Sha>
+    </Dependency>
     <Dependency Name="System.Collections.Immutable" Version="5.0.0-rc.1.20427.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>ba5b5d18915eb637e53719373b857a2a310c204f</Sha>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -27,6 +27,8 @@
     <MicrosoftExtensionsDependencyModelVersion>5.0.0-rc.1.20427.3</MicrosoftExtensionsDependencyModelVersion>
     <MicrosoftExtensionsHostFactoryResolverSourcesVersion>5.0.0-rc.1.20427.3</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
     <MicrosoftExtensionsLoggingVersion>5.0.0-rc.1.20427.3</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>5.0.0-rc.1.20427.3</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-rc.1.20427.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Other dependencies">
     <MicrosoftCodeAnalysisVersion>3.7.0</MicrosoftCodeAnalysisVersion>

diff --git a/eng/helix.proj b/eng/helix.proj
@@ -33,7 +33,7 @@
 
   <PropertyGroup>
     <HelixPreCommands Condition = "'$(HelixTargetQueue.StartsWith(`Windows`))'">$(HelixPreCommands); SqlLocalDB start</HelixPreCommands>
-    <XUnitPublishTargetFramework>netcoreapp5.0</XUnitPublishTargetFramework>
+    <XUnitPublishTargetFramework>net5.0</XUnitPublishTargetFramework>
     <XUnitRuntimeTargetFramework>netcoreapp2.0</XUnitRuntimeTargetFramework>
     <XUnitRunnerVersion>2.4.1</XUnitRunnerVersion>
     <XUnitArguments></XUnitArguments>

diff --git a/global.json b/global.json
@@ -3,6 +3,7 @@
     "dotnet": "5.0.100-preview.8.20417.9",
     "runtimes": {
       "dotnet": [
+        "$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)",
         "3.1.7"
       ],
       "aspnetcore": [