Skip to content

Commit 71d36ba

Browse files
vatsan-madhavanvatsan-madhavan
authored
Set TargetingPackVersion intentionally (#604)
* Setting TargetingPackVersion explicitly. Excluding Test projects from RuntimeFrameworkVersion. * Move M.NETCore.App from product -> toolset dependency * Moving all corefx (and coreclr) dependencies to ToolsetDependencies (per mmitche)
1 parent c982b9e commit 71d36ba

File tree

4 files changed

+63
-57
lines changed

4 files changed

+63
-57
lines changed

‎eng/Version.Details.xml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,79 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27618-02">
5-
<Uri>https://github.com/dotnet/core-setup</Uri>
6-
<Sha>25abcf43fe1da7a8bdad3d5053ebc01dc80ea450</Sha>
7-
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview5.19208.4">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview5.19218.1">
95
<Uri>https://github.com/dotnet/winforms</Uri>
10-
<Sha>fd52f87e309d708ce4491f7c65b892f29091346f</Sha>
6+
<Sha>f977a22b418447e1a42d04a61ab29c289465146f</Sha>
117
</Dependency>
12-
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
8+
</ProductDependencies>
9+
<ToolsetDependencies>
10+
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
1311
<Uri>https://github.com/dotnet/corefx</Uri>
14-
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
12+
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
1513
</Dependency>
16-
<Dependency Name="System.CodeDom" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
14+
<Dependency Name="System.CodeDom" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
1715
<Uri>https://github.com/dotnet/corefx</Uri>
18-
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
16+
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
1917
</Dependency>
20-
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
18+
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
2119
<Uri>https://github.com/dotnet/corefx</Uri>
22-
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
20+
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
2321
</Dependency>
24-
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
22+
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
2523
<Uri>https://github.com/dotnet/corefx</Uri>
26-
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
24+
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
2725
</Dependency>
28-
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
26+
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
2927
<Uri>https://github.com/dotnet/corefx</Uri>
30-
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
28+
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
3129
</Dependency>
32-
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
30+
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
3331
<Uri>https://github.com/dotnet/corefx</Uri>
34-
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
32+
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
3533
</Dependency>
36-
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
34+
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
3735
<Uri>https://github.com/dotnet/corefx</Uri>
38-
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
36+
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
3937
</Dependency>
40-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
38+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
4139
<Uri>https://github.com/dotnet/corefx</Uri>
42-
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
40+
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
4341
</Dependency>
44-
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
42+
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
4543
<Uri>https://github.com/dotnet/corefx</Uri>
46-
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
44+
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
4745
</Dependency>
48-
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
46+
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
4947
<Uri>https://github.com/dotnet/corefx</Uri>
50-
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
48+
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
5149
</Dependency>
52-
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
50+
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
5351
<Uri>https://github.com/dotnet/corefx</Uri>
54-
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
52+
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
5553
</Dependency>
56-
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
54+
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
5755
<Uri>https://github.com/dotnet/corefx</Uri>
58-
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
56+
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
5957
</Dependency>
60-
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
58+
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
6159
<Uri>https://github.com/dotnet/corefx</Uri>
62-
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
60+
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
6361
</Dependency>
64-
</ProductDependencies>
65-
<ToolsetDependencies>
66-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19218.1">
62+
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27618-06">
63+
<Uri>https://github.com/dotnet/core-setup</Uri>
64+
<Sha>4d6087136f8af1c076f706f59441f6de9795980b</Sha>
65+
</Dependency>
66+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19217.1">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
6868
<Sha>46718d98c0fd03690a6a8c83da692a4a85a17902</Sha>
6969
</Dependency>
7070
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19218.1">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
7272
<Sha>46718d98c0fd03690a6a8c83da692a4a85a17902</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview5.19217.12" CoherentParentDependency="Microsoft.NETCore.App">
74+
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
7575
<Uri>https://github.com/dotnet/corefx</Uri>
76-
<Sha>1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14</Sha>
76+
<Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
7777
</Dependency>
7878
</ToolsetDependencies>
7979
</Dependencies>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@
77
</PropertyGroup>
88
<!-- NuGet Package Versions -->
99
<PropertyGroup>
10-
<MicrosoftPrivateWinformsVersion>4.8.0-preview5.19208.4</MicrosoftPrivateWinformsVersion>
10+
<MicrosoftPrivateWinformsVersion>4.8.0-preview5.19218.1</MicrosoftPrivateWinformsVersion>
1111
</PropertyGroup>
1212
<!-- Packages that come from https://github.com/dotnet/core-setup -->
1313
<PropertyGroup>
14-
<MicrosoftNETCoreAppVersion>3.0.0-preview5-27618-02</MicrosoftNETCoreAppVersion>
15-
<MicrosoftNETCorePlatformsVersion>3.0.0-preview5.19217.12</MicrosoftNETCorePlatformsVersion>
16-
<SystemDrawingCommonVersion>4.6.0-preview5.19217.12</SystemDrawingCommonVersion>
17-
<SystemDirectoryServicesVersion>4.6.0-preview5.19217.12</SystemDirectoryServicesVersion>
18-
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview5.19217.12</SystemReflectionMetadataLoadContextVersion>
14+
<MicrosoftNETCoreAppVersion>3.0.0-preview5-27618-06</MicrosoftNETCoreAppVersion>
15+
<MicrosoftNETCorePlatformsVersion>3.0.0-preview5.19218.1</MicrosoftNETCorePlatformsVersion>
16+
<SystemDrawingCommonVersion>4.6.0-preview5.19218.1</SystemDrawingCommonVersion>
17+
<SystemDirectoryServicesVersion>4.6.0-preview5.19218.1</SystemDirectoryServicesVersion>
18+
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview5.19218.1</SystemReflectionMetadataLoadContextVersion>
1919
</PropertyGroup>
2020
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
2121
<PropertyGroup>
22-
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview5.19217.12</MicrosoftWin32RegistryPackageVersion>
23-
<SystemCodeDomPackageVersion>4.6.0-preview5.19217.12</SystemCodeDomPackageVersion>
24-
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview5.19217.12</SystemConfigurationConfigurationManagerPackageVersion>
25-
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview5.19217.12</SystemDiagnosticsEventLogPackageVersion>
26-
<SystemReflectionEmitPackageVersion>4.6.0-preview5.19217.12</SystemReflectionEmitPackageVersion>
22+
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview5.19218.1</MicrosoftWin32RegistryPackageVersion>
23+
<SystemCodeDomPackageVersion>4.6.0-preview5.19218.1</SystemCodeDomPackageVersion>
24+
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview5.19218.1</SystemConfigurationConfigurationManagerPackageVersion>
25+
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview5.19218.1</SystemDiagnosticsEventLogPackageVersion>
26+
<SystemReflectionEmitPackageVersion>4.6.0-preview5.19218.1</SystemReflectionEmitPackageVersion>
2727
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
28-
<SystemSecurityAccessControlPackageVersion>4.6.0-preview5.19217.12</SystemSecurityAccessControlPackageVersion>
29-
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview5.19217.12</SystemSecurityCryptographyXmlPackageVersion>
30-
<SystemSecurityPermissionsPackageVersion>4.6.0-preview5.19217.12</SystemSecurityPermissionsPackageVersion>
31-
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview5.19217.12</SystemSecurityPrincipalWindowsPackageVersion>
32-
<SystemWindowsExtensionsPackageVersion>4.6.0-preview5.19217.12</SystemWindowsExtensionsPackageVersion>
28+
<SystemSecurityAccessControlPackageVersion>4.6.0-preview5.19218.1</SystemSecurityAccessControlPackageVersion>
29+
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview5.19218.1</SystemSecurityCryptographyXmlPackageVersion>
30+
<SystemSecurityPermissionsPackageVersion>4.6.0-preview5.19218.1</SystemSecurityPermissionsPackageVersion>
31+
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview5.19218.1</SystemSecurityPrincipalWindowsPackageVersion>
32+
<SystemWindowsExtensionsPackageVersion>4.6.0-preview5.19218.1</SystemWindowsExtensionsPackageVersion>
3333
</PropertyGroup>
3434
<!-- Packages that come from https://github.com/dotnet/arcade -->
3535
<PropertyGroup>

‎eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppVersion)'!='' And '$(NoTargets)'!='true'">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
3+
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppVersion)'!='' And '$(NoTargets)'!='true' And $(TargetFramework.StartsWith('netcoreapp3.')) ">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
44
</PropertyGroup>
55

66
<!-- workaround for package downgrade in Microsoft.NetCore.Platforms -->

‎eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@
66
<ItemGroup>
77
<PackageReference Include="Microsoft.NETCore.Platforms"
88
Version="$(MicrosoftNETCorePlatformsVersion)"
9-
Condition="'$(MSBuildProjectExtension)'!='.vcxproj' And '$(IsTestProject)'!='true'"/>
9+
Condition="'$(MSBuildProjectExtension)'!='.vcxproj' And '$(WpfTest)'!='true'"/>
10+
1011
<AdditionalPackageReference Include="Microsoft.NETCore.Platforms"
1112
Version="$(MicrosoftNETCorePlatformsVersion)"
12-
Condition="'$(ManagedCxx)'=='true'"/>
13+
Condition="'$(ManagedCxx)'=='true' And '$(WpfTest)'!='true'"/>
14+
15+
<FrameworkReference Update="Microsoft.NETCore.App"
16+
Condition="'$(MicrosoftNETCoreAppVersion)'!='' And '$(NoTargets)'!='true' And $(TargetFramework.StartsWith('netcoreapp3.')) And '$(MSBuildProjectExtension)'!='.vcxproj' And '$(WpfTest)'!='true'">
17+
<TargetingPackVersion>$(MicrosoftNETCoreAppVersion)</TargetingPackVersion>
18+
</FrameworkReference>
1319
</ItemGroup>
1420

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

0 commit comments

Comments
 (0)