diff --git a/Directory.Build.props b/Directory.Build.props
index 655264983262..273dd8d2ef71 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,6 +7,8 @@
true
+
+ false
true
$(MSBuildProjectName)/ref
diff --git a/eng/Versions.props b/eng/Versions.props
index e5f183c7da20..0d8c4cef01b3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -17,7 +17,7 @@
$(MicrosoftNETSdkILPackageVersion)
- 1.5.0
+ 1.8.0
15.4.8
15.4.8
5.0.0-beta.20427.5
diff --git a/eng/ilasm.ilproj b/eng/ilasm.ilproj
index b8be3b2b2255..3a11b2bfe499 100644
--- a/eng/ilasm.ilproj
+++ b/eng/ilasm.ilproj
@@ -4,7 +4,7 @@
project. -->
- netcoreapp3.0
+ net5.0
diff --git a/global.json b/global.json
index 39daaab86d87..7ebf25fe6738 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
{
"tools": {
- "dotnet": "5.0.100-preview.6.20310.4",
+ "dotnet": "5.0.100-rc.1.20453.7",
"runtimes": {
"dotnet": [
- "3.0.0"
+ "6.0.0-alpha.1.20452.19"
]
}
},
diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj
index ef94924561d2..36a49f01677b 100644
--- a/src/ILLink.Tasks/ILLink.Tasks.csproj
+++ b/src/ILLink.Tasks/ILLink.Tasks.csproj
@@ -2,7 +2,7 @@
- netcoreapp3.0;net472
+ net5.0;net472
false
MSBuild tasks for running the IL Linker
latest
@@ -36,7 +36,7 @@
-
+
diff --git a/src/ILLink.Tasks/LinkTask.cs b/src/ILLink.Tasks/LinkTask.cs
index 11da51673d5b..a2960f1c4fd7 100644
--- a/src/ILLink.Tasks/LinkTask.cs
+++ b/src/ILLink.Tasks/LinkTask.cs
@@ -235,7 +235,7 @@ public class ILLink : ToolTask
var taskDirectory = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location);
// The linker always runs on .NET Core, even when using desktop MSBuild to host ILLink.Tasks.
- _illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "netcoreapp3.0", "illink.dll");
+ _illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "net5.0", "illink.dll");
return _illinkPath;
}
set => _illinkPath = value;
diff --git a/src/analyzer/analyzer.csproj b/src/analyzer/analyzer.csproj
index c9b38b487f19..3166183ecc5c 100644
--- a/src/analyzer/analyzer.csproj
+++ b/src/analyzer/analyzer.csproj
@@ -9,7 +9,7 @@
$(DefineConstants);FEATURE_ILLINK
- netcoreapp3.0
+ net5.0
diff --git a/src/analyzer/common/Mono.Options/Options.cs b/src/analyzer/common/Mono.Options/Options.cs
index a68c1608b7c5..a289e6281283 100644
--- a/src/analyzer/common/Mono.Options/Options.cs
+++ b/src/analyzer/common/Mono.Options/Options.cs
@@ -748,7 +748,7 @@ protected OptionException (SerializationInfo info, StreamingContext context)
get {return this.option;}
}
-#if !PCL
+#if !PCL && !NETCOREAPP
#pragma warning disable 618 // SecurityPermissionAttribute is obsolete
[SecurityPermission (SecurityAction.LinkDemand, SerializationFormatter = true)]
#pragma warning restore 618
diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj
index 947c270afd98..42ca847e9588 100644
--- a/src/linker/Mono.Linker.csproj
+++ b/src/linker/Mono.Linker.csproj
@@ -5,6 +5,7 @@
+ net5.0
$(DefineConstants);FEATURE_ILLINK
true
- $(DefineConstants);NETCOREAPP
diff --git a/test/Mono.Linker.Tests/TestCases/TestDatabase.cs b/test/Mono.Linker.Tests/TestCases/TestDatabase.cs
index 562d271574f2..7c8bbc152f7e 100644
--- a/test/Mono.Linker.Tests/TestCases/TestDatabase.cs
+++ b/test/Mono.Linker.Tests/TestCases/TestDatabase.cs
@@ -251,12 +251,14 @@ static void GetDirectoryPaths (out string rootSourceDirectory, out string testCa
var configDirectoryName = "Release";
#endif
-#if NETCOREAPP3_0
+#if NET5_0
+ var tfm = "net5.0";
+#elif NETCOREAPP3_0
var tfm = "netcoreapp3.0";
#elif NET471
var tfm = "net471";
#else
- var tfm = "";
+ #error "Unknown TFM"
#endif
#if ILLINK
diff --git a/test/Mono.Linker.Tests/TestCasesRunner/TestCaseSandbox.cs b/test/Mono.Linker.Tests/TestCasesRunner/TestCaseSandbox.cs
index 24869feef834..5c8b2900f67f 100644
--- a/test/Mono.Linker.Tests/TestCasesRunner/TestCaseSandbox.cs
+++ b/test/Mono.Linker.Tests/TestCasesRunner/TestCaseSandbox.cs
@@ -127,7 +127,7 @@ public virtual void Populate (TestCaseMetadaProvider metadataProvider)
private static NPath GetExpectationsAssemblyPath ()
{
- return new Uri (typeof (KeptAttribute).Assembly.CodeBase).LocalPath.ToNPath ();
+ return new Uri (typeof (KeptAttribute).Assembly.Location).LocalPath.ToNPath ();
}
protected void CopyToInputAndExpectations (NPath source)