Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use RuntimeFrameworkVersion in builds #534

Merged
merged 4 commits into from
Apr 9, 2019
Merged

Use RuntimeFrameworkVersion in builds #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8d1558
Use RuntimeFrameworkVersion instead of depending on the shared framew…
vatsan-madhavan Apr 8, 2019
68725a3
Setting RuntimeFrameworkVersion conditionally for netcoreapp3.x projects
vatsan-madhavan Apr 8, 2019
e5fffce
Add additional logic to minimize conflicts and accomodate needs of bu…
vatsan-madhavan Apr 9, 2019
01eb515
Merge with master
vatsan-madhavan Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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">
Expand All @@ -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>
2 changes: 2 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions eng/WpfArcadeSdk/Sdk/Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions eng/WpfArcadeSdk/Sdk/Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
19 changes: 19 additions & 0 deletions eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
15 changes: 15 additions & 0 deletions eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>