Skip to content

TFM Fixups for release/3.1 #1835

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

Merged
merged 12 commits into from
Sep 11, 2019
Merged

TFM Fixups for release/3.1 #1835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e7ada5a
Update project TargetFramework(s) to netcoreapp3.1 and set TargetFram…
vatsan-madhavan Sep 10, 2019
0d56e69
Add constant for 3.1
vatsan-madhavan Sep 10, 2019
a0451d7
Update netcore version specific conditions
vatsan-madhavan Sep 10, 2019
8975f75
Add System.Resources.Extensions references to PresentationUI
vatsan-madhavan Sep 10, 2019
979f34a
Make projecttemplates and ArchNeutral use 3.1 versionprefix
vatsan-madhavan Sep 10, 2019
cf2daa4
Update project templates for netcoreapp3.1
vatsan-madhavan Sep 10, 2019
e1d79c0
Include "ResolveTargetingPackAssets" in AfterTargets; Remove unused T…
vatsan-madhavan Sep 11, 2019
de3bbdb
Update global.json tools.dotnet with SDK with netcoreapp3.1 support
vatsan-madhavan Sep 11, 2019
7164e12
Update dependencies from ".NET Tools - Latest" channel
vatsan-madhavan Sep 11, 2019
f10b5d5
darc update-dependencies --channel ".NET Core 3.1 Dev"
vatsan-madhavan Sep 11, 2019
7f91d7c
Workaround for https://github.com/dotnet/core-sdk/issues/4744
vatsan-madhavan Sep 11, 2019
f6d7456
No not overwrite NoWarn - append to it
vatsan-madhavan Sep 11, 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
88 changes: 46 additions & 42 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.1-preview1.19461.5">
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.1-preview1.19461.15">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>ff7679d86eff72ef6c728acab5bfedbec93ab632</Sha>
<Sha>08e9d68208d5daa3fbb6cac819774873053793d1</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.Win32.Registry" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.CodeDom" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Diagnostics.EventLog" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.DirectoryServices" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Drawing.Common" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="System.Reflection.Emit" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Reflection.Emit" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.AccessControl" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Cryptography.Xml" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Permissions" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Principal.Windows" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Windows.Extensions" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc1-19429-05" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App" Version="3.1.0-preview1.19459.38" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>8880d723b63cbca2dcee68870c6b23ffc36d1811</Sha>
<Sha>0d6763312a2754e45d604ebdc69c8ac7e21a2187</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19460.3">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand All @@ -71,29 +71,29 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0f5cfb20a355c27bc84cedd049c946b44a7fc1da</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="5.0.0-alpha1.19420.2">
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.1-preview1.19461.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>83ab428ae9904012fbf4f109c2a5026793136966</Sha>
<Sha>933873f081a7f33018814580933425ad6c985f64</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="4.6.0-rc1.19420.10" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.IO.Packaging" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>d341fd37dcb2c22e382adccdc06770cf8f160577</Sha>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-rc1.19428.6" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.0-preview1.19459.7" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>410268b19f7b0b1b1215061f8891a82323ce5955</Sha>
<Sha>d13d1b61de8a28e0d5509273a6ec3de35b1dd258</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.0.0-rc1.19428.6" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.1.0-preview1.19459.7" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>410268b19f7b0b1b1215061f8891a82323ce5955</Sha>
<Sha>d13d1b61de8a28e0d5509273a6ec3de35b1dd258</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-rc1.19428.6" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.0-preview1.19459.7" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>410268b19f7b0b1b1215061f8891a82323ce5955</Sha>
<Sha>d13d1b61de8a28e0d5509273a6ec3de35b1dd258</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19460.3">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand All @@ -107,5 +107,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0f5cfb20a355c27bc84cedd049c946b44a7fc1da</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
43 changes: 22 additions & 21 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,40 @@
<PreReleaseVersionLabel>preview1</PreReleaseVersionLabel>
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<SystemIOPackagingVersion>4.6.0-rc1.19420.10</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>4.7.0-preview1.19459.13</SystemResourcesExtensionsVersion>
<SystemIOPackagingVersion>4.7.0-preview1.19459.13</SystemIOPackagingVersion>
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>4.8.1-preview1.19461.5</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>4.8.1-preview1.19461.15</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>3.0.0-rc1.19428.6</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>3.0.0-rc1.19428.6</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>3.0.0-rc1.19428.6</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreRuntimeCoreCLRVersion>3.1.0-preview1.19459.7</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>3.1.0-preview1.19459.7</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>3.1.0-preview1.19459.7</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<MicrosoftNETCoreAppVersion>3.0.0-rc1-19429-05</MicrosoftNETCoreAppVersion>
<MicrosoftNETCorePlatformsVersion>3.0.0-rc1.19420.10</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>4.6.0-rc1.19420.10</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>4.6.0-rc1.19420.10</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>4.6.0-rc1.19420.10</SystemReflectionMetadataLoadContextVersion>
<MicrosoftNETCoreAppVersion>3.1.0-preview1.19459.38</MicrosoftNETCoreAppVersion>
<MicrosoftNETCorePlatformsVersion>3.1.0-preview1.19459.13</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>4.7.0-preview1.19459.13</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>4.7.0-preview1.19459.13</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>4.7.0-preview1.19459.13</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<MicrosoftWin32RegistryPackageVersion>4.6.0-rc1.19420.10</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-rc1.19420.10</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-rc1.19420.10</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.6.0-rc1.19420.10</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>4.6.0-rc1.19420.10</SystemReflectionEmitPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.7.0-preview1.19459.13</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>4.7.0-preview1.19459.13</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.7.0-preview1.19459.13</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.7.0-preview1.19459.13</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>4.7.0-preview1.19459.13</SystemReflectionEmitPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>4.6.0-rc1.19420.10</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-rc1.19420.10</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-rc1.19420.10</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-rc1.19420.10</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-rc1.19420.10</SystemWindowsExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>4.7.0-preview1.19459.13</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.7.0-preview1.19459.13</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.7.0-preview1.19459.13</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.7.0-preview1.19459.13</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.7.0-preview1.19459.13</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
Expand Down Expand Up @@ -113,6 +114,6 @@
It is worth reiterating that this package *should not* be consumed to build the product.
-->
<PropertyGroup>
<MicrosoftDotNetWpfDncEngVersion>5.0.0-alpha1.19420.2</MicrosoftDotNetWpfDncEngVersion>
<MicrosoftDotNetWpfDncEngVersion>4.8.1-preview1.19461.9</MicrosoftDotNetWpfDncEngVersion>
</PropertyGroup>
</Project>
7 changes: 7 additions & 0 deletions eng/WpfArcadeSdk/Sdk/Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@
-->
<NoWarn Condition="'$(BuildingInsideVisualStudio)'=='true'">$(NoWarn);NU1605</NoWarn>

<!--
Workaround for https://github.com/dotnet/core-sdk/issues/4744
.NET Core 3.1 SDK hasn't consumed the fix for https://github.com/NuGet/Home/issues/8467 yet.
Suppress these warnings temporarily
-->
<NoWarn>$(NoWarn);NU5128;NU5313;NU5131</NoWarn>

<!--
Support for suppressing warnings by supplying /p:AdditionalNoWarn=0123;4567 from
dotnet.exe/msbuild commandline.
Expand Down
5 changes: 4 additions & 1 deletion eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<Project>
<PropertyGroup>
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppVersion)'!='' And '$(NoTargets)'!='true' And $(TargetFramework.StartsWith('netcoreapp3.'))">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppVersion)'!='' And
'$(NoTargets)'!='true' And
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1')">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
</PropertyGroup>

<!-- workaround for package downgrade in Microsoft.NetCore.Platforms -->
Expand Down
10 changes: 7 additions & 3 deletions eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
Condition="'$(ManagedCxx)'=='true'"/>

<FrameworkReference Update="Microsoft.NETCore.App"
Condition="'$(MicrosoftNETCoreAppVersion)'!='' And '$(NoTargets)'!='true' And $(TargetFramework.StartsWith('netcoreapp3.')) And '$(MSBuildProjectExtension)'!='.vcxproj'">
Condition="'$(MicrosoftNETCoreAppVersion)'!=''
And '$(NoTargets)'!='true'
And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1')
And '$(MSBuildProjectExtension)'!='.vcxproj'">
<TargetingPackVersion>$(MicrosoftNETCoreAppVersion)</TargetingPackVersion>
</FrameworkReference>

Expand All @@ -25,7 +29,7 @@
</ItemGroup>

<PropertyGroup>
<!-- If TargetFramework is not netcoreapp3.x, then reset RuntimeFrameworkVersion -->
<RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('netcoreapp3.'))" />
<!-- If TargetFramework is not one of the supported .NET Core versions, then reset RuntimeFrameworkVersion -->
<RuntimeFrameworkVersion Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp') Or ('$(TargetFrameworkVersion)' != 'v3.0' And '$(TargetFrameworkVersion)' != 'v3.1')" />
</PropertyGroup>
</Project>
Loading