Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViktor Hofer <viktor.hofer@microsoft.com>2021-02-25 13:23:21 +0300
committerGitHub <noreply@github.com>2021-02-25 13:23:21 +0300
commit653b3103d197075e0a4efbc7450b0d0fceff8fff (patch)
treebcf79552549a1a9d8e29136a21bcbd745c1c9c60 /Directory.Build.props
parent12ec2197ed3999c98f49c006a27ee761282df168 (diff)
Remove duplicated ILLink PackageReference and update target version of the SDK to 6.0 (#48462)
* Remove duplicated ILLink PackageReference The Arcade.SDK already package refrences the ILLink package. The duplicate reference in illink.targets caused SDK errors as the Arcade reference has IsImplicitlyDefined set which doesn't allow an additional reference with the same identity. Also, as the ILLink package already exposes the path to the assembly via its props file, using that instead of manually constructing the path to the assembly. The SDK target version update is required as the sequencing of the ILLink.props file was wrong and is required for this change. This isn't considered a breaking change, as the SDK's minimum required version isn't changed. * Update arcade dependencies * Remove NuGet pack tasks pkgref * Add mega hack workaround * Remove KnownFrameworkReference items * Don't hardcode SDK value in helix submission... * Update runtimeConfiguration.targets * Fix double publishing error in mobile tests * Set DotNetCliVersion to right version for aspnetcoreruntime * Update sendtohelixhelp.proj * Update sendtohelixhelp.proj Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com>
Diffstat (limited to 'Directory.Build.props')
-rw-r--r--Directory.Build.props4
1 files changed, 2 insertions, 2 deletions
diff --git a/Directory.Build.props b/Directory.Build.props
index 59ea4f1edc0..0919ebc539b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -38,8 +38,8 @@
<!-- The TFMs to build and test against. -->
<PropertyGroup>
<NetCoreAppCurrentVersion>$(MajorVersion).$(MinorVersion)</NetCoreAppCurrentVersion>
- <AspNetCoreAppCurrentVersion>5.0</AspNetCoreAppCurrentVersion>
- <NetCoreAppToolCurrentVersion>5.0</NetCoreAppToolCurrentVersion>
+ <AspNetCoreAppCurrentVersion>6.0</AspNetCoreAppCurrentVersion>
+ <NetCoreAppToolCurrentVersion>6.0</NetCoreAppToolCurrentVersion>
<NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
<NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>