Use RuntimeFrameworkVersion in builds (#534)

* Use RuntimeFrameworkVersion instead of depending on the shared framework. * Setting RuntimeFrameworkVersion conditionally for netcoreapp3.x projects * Add additional logic to minimize conflicts and accomodate needs of building dotnet-wpf-int; Update dependencies;
dotnet · Apr 9, 2019 · 5fbd455 · 5fbd455
1 parent ae0597e
commit 5fbd455
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 4 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -41,10 +41,6 @@
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>6ca16758a5d454c1f1b04975bf55f259dd71fc49</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27608-16">
-      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>59c193bd93deafba5926cb827872b80338aca7c0</Sha>
-    </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview5.19208.5" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>6ca16758a5d454c1f1b04975bf55f259dd71fc49</Sha>
@@ -65,6 +61,10 @@
       <Sha>6ca16758a5d454c1f1b04975bf55f259dd71fc49</Sha>
       <SourceBuildId>5589</SourceBuildId>
     </Dependency>
+    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27609-01">
+      <Uri>https://github.com/dotnet/core-setup</Uri>
+      <Sha>0d98c40e504e222ef27a971a3a10b1ee4031463a</Sha>
+    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19209.1">
@@ -75,5 +75,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>9d7e665ecf2606094677524ecd5af0fc39c7bb49</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview5.19208.5" CoherentParentDependency="Microsoft.NETCore.App">
+      <Uri>https://github.com/dotnet/corefx</Uri>
+      <Sha>6ca16758a5d454c1f1b04975bf55f259dd71fc49</Sha>
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -8,6 +8,8 @@
     <MicrosoftPrivateWinformsVersion>4.8.0-preview5.19208.4</MicrosoftPrivateWinformsVersion>
     <SystemDrawingCommonVersion>4.6.0-preview5.19208.5</SystemDrawingCommonVersion>
     <SystemDirectoryServicesVersion>4.6.0-preview5.19208.5</SystemDirectoryServicesVersion>
+    <MicrosoftNETCoreAppVersion>3.0.0-preview5-27609-01</MicrosoftNETCoreAppVersion>
+    <MicrosoftNETCorePlatformsVersion>3.0.0-preview5.19208.5</MicrosoftNETCorePlatformsVersion>
   </PropertyGroup>
   <!-- NuGet Package Versions -->
   <PropertyGroup>

diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props
@@ -23,6 +23,7 @@
     <IncludeDllSafeSearchPathAttribute Condition="'$(IncludeDllSafeSearchPathAttribute )'==''">true</IncludeDllSafeSearchPathAttribute>
   </PropertyGroup>
 
+  <Import Project="$(WpfArcadeSdkToolsDir)RuntimeFrameworkReference.props"/>
   <Import Project="$(WpfArcadeSdkToolsDir)SystemResources.props"/>
   <Import Project="$(WpfArcadeSdkToolsDir)TargetFrameworks.props" />
   <Import Project="$(WpfArcadeSdkToolsDir)VersionSuffix.props" />

diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.targets b/eng/WpfArcadeSdk/Sdk/Sdk.targets
@@ -3,6 +3,7 @@
   <Import Project="$(WpfArcadeSdkToolsDir)Signing.targets" />
 
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+  <Import Project="$(WpfArcadeSdkToolsDir)RuntimeFrameworkReference.targets"/>
   <Import Project="$(WpfArcadeSdkToolsDir)InlineTasks.targets" />
   <Import Project="$(WpfArcadeSdkToolsDir)ShippingProjects.targets" />
   <Import Project="$(WpfArcadeSdkToolsDir)GenerateProgramFileForTests.targets" />

diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props
@@ -0,0 +1,19 @@
+<Project>
+  <PropertyGroup>
+    <RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppVersion)'!='' And '$(NoTargets)'!='true'">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
+  </PropertyGroup>
+
+  <!-- 
+    Explicitly import Microsoft.NETCore.Platforms to prevent using the one from the SDK, which
+    usually lags behind the version that WPF gets from CoreFx packages 
+  -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" Condition="'$(MSBuildProjectExtension)'!='.vcxproj'"/>
+  </ItemGroup>
+
+  <!-- workaround for package downgrade in Microsoft.NetCore.Platforms -->
+  <PropertyGroup>
+    <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
+  </PropertyGroup>
+
+</Project>
diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
@@ -0,0 +1,15 @@
+<Project>
+  <!-- 
+    Explicitly import Microsoft.NETCore.Platforms to prevent using the one from the SDK, which
+    usually lags behind the version that WPF gets from CoreFx packages 
+  -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" Condition="'$(MSBuildProjectExtension)'!='.vcxproj'"/>
+    <AdditionalPackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" Condition="'$(ManagedCxx)'=='true'"/>
+  </ItemGroup>
+
+  <PropertyGroup>
+    <!-- If TargetFramework is not netcoreapp3.x, then reset RuntimeFrameworkVersion -->
+    <RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('netcoreapp3.'))" />
+  </PropertyGroup>
+</Project>