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.

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

Set TargetingPackVersion intentionally #604

Merged
merged 4 commits into from
Apr 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
74 changes: 37 additions & 37 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,79 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27618-02">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>25abcf43fe1da7a8bdad3d5053ebc01dc80ea450</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview5.19208.4">
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview5.19218.1">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>fd52f87e309d708ce4491f7c65b892f29091346f</Sha>
<Sha>f977a22b418447e1a42d04a61ab29c289465146f</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.CodeDom" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
</Dependency>
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19218.1">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27618-06">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>4d6087136f8af1c076f706f59441f6de9795980b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19217.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>46718d98c0fd03690a6a8c83da692a4a85a17902</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19218.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>46718d98c0fd03690a6a8c83da692a4a85a17902</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
32 changes: 16 additions & 16 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,29 @@
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>4.8.0-preview5.19208.4</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>4.8.0-preview5.19218.1</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<MicrosoftNETCoreAppVersion>3.0.0-preview5-27618-02</MicrosoftNETCoreAppVersion>
<MicrosoftNETCorePlatformsVersion>3.0.0-preview5.19217.12</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>4.6.0-preview5.19217.12</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>4.6.0-preview5.19217.12</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview5.19217.12</SystemReflectionMetadataLoadContextVersion>
<MicrosoftNETCoreAppVersion>3.0.0-preview5-27618-06</MicrosoftNETCoreAppVersion>
<MicrosoftNETCorePlatformsVersion>3.0.0-preview5.19218.1</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>4.6.0-preview5.19218.1</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>4.6.0-preview5.19218.1</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview5.19218.1</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview5.19217.12</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview5.19217.12</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview5.19217.12</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview5.19217.12</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>4.6.0-preview5.19217.12</SystemReflectionEmitPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview5.19218.1</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview5.19218.1</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview5.19218.1</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview5.19218.1</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>4.6.0-preview5.19218.1</SystemReflectionEmitPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>4.6.0-preview5.19217.12</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview5.19217.12</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview5.19217.12</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview5.19217.12</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview5.19217.12</SystemWindowsExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>4.6.0-preview5.19218.1</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview5.19218.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview5.19218.1</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview5.19218.1</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview5.19218.1</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppVersion)'!='' And '$(NoTargets)'!='true'">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppVersion)'!='' And '$(NoTargets)'!='true' And $(TargetFramework.StartsWith('netcoreapp3.')) ">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
</PropertyGroup>

<!-- workaround for package downgrade in Microsoft.NetCore.Platforms -->
Expand Down
12 changes: 9 additions & 3 deletions eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,20 @@
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.Platforms"
Version="$(MicrosoftNETCorePlatformsVersion)"
Condition="'$(MSBuildProjectExtension)'!='.vcxproj' And '$(IsTestProject)'!='true'"/>
Condition="'$(MSBuildProjectExtension)'!='.vcxproj' And '$(WpfTest)'!='true'"/>

<AdditionalPackageReference Include="Microsoft.NETCore.Platforms"
Version="$(MicrosoftNETCorePlatformsVersion)"
Condition="'$(ManagedCxx)'=='true'"/>
Condition="'$(ManagedCxx)'=='true' And '$(WpfTest)'!='true'"/>

<FrameworkReference Update="Microsoft.NETCore.App"
Condition="'$(MicrosoftNETCoreAppVersion)'!='' And '$(NoTargets)'!='true' And $(TargetFramework.StartsWith('netcoreapp3.')) And '$(MSBuildProjectExtension)'!='.vcxproj' And '$(WpfTest)'!='true'">
<TargetingPackVersion>$(MicrosoftNETCoreAppVersion)</TargetingPackVersion>
</FrameworkReference>
</ItemGroup>

<PropertyGroup>
<!-- If TargetFramework is not netcoreapp3.x, then reset RuntimeFrameworkVersion -->
<RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('netcoreapp3.'))" />
<RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('netcoreapp3.')) And '$(WpfTest)'=='true'" />
</PropertyGroup>
</Project>