diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1
index a266352db412..720c6de5b2e9 100644
--- a/eng/restore-toolset.ps1
+++ b/eng/restore-toolset.ps1
@@ -18,7 +18,7 @@ function InitializeCustomSDKToolset {
InstallDotNetSharedFramework "1.0.5"
InstallDotNetSharedFramework "1.1.2"
InstallDotNetSharedFramework "2.1.0"
- InstallDotNetSharedFramework "2.2.2"
+ InstallDotNetSharedFramework "2.2.3"
CreateBuildEnvScript
InstallNuget
diff --git a/eng/restore-toolset.sh b/eng/restore-toolset.sh
index 4c7f656c4b2d..7d71703492e5 100644
--- a/eng/restore-toolset.sh
+++ b/eng/restore-toolset.sh
@@ -13,7 +13,7 @@ function InitializeCustomSDKToolset {
InstallDotNetSharedFramework "1.0.5"
InstallDotNetSharedFramework "1.1.2"
InstallDotNetSharedFramework "2.1.0"
- InstallDotNetSharedFramework "2.2.2"
+ InstallDotNetSharedFramework "2.2.3"
}
# Installs additional shared frameworks for testing purposes
diff --git a/global.json b/global.json
index be46d57cb59b..d46605734bfb 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "3.0.100-preview3-010404",
+ "dotnet": "3.0.100-preview4-010564",
"vs-opt": {
"version": "15.9"
}
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveAppHosts.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveAppHosts.cs
index 9a51cef83385..eb7e615dfe5a 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveAppHosts.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveAppHosts.cs
@@ -202,12 +202,13 @@ private ITaskItem GetHostItem(string runtimeIdentifier,
packagesToDownload.Add(packageToDownload);
- appHostItem.SetMetadata(MetadataKeys.RuntimeIdentifier, runtimeIdentifier);
appHostItem.SetMetadata(MetadataKeys.PackageName, hostPackName);
appHostItem.SetMetadata(MetadataKeys.PackageVersion, appHostPackVersion);
- appHostItem.SetMetadata(MetadataKeys.RelativePath, hostRelativePathInPackage);
}
+ appHostItem.SetMetadata(MetadataKeys.RelativePath, hostRelativePathInPackage);
+ appHostItem.SetMetadata(MetadataKeys.RuntimeIdentifier, runtimeIdentifier);
+
return appHostItem;
}
}
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveRuntimePackAssets.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveRuntimePackAssets.cs
index f4247c8a3d6e..f5f9b2c23eee 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveRuntimePackAssets.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveRuntimePackAssets.cs
@@ -71,6 +71,7 @@ void AddAsset(string assetPath, string assetType)
assetPath.EndsWith(".map", StringComparison.OrdinalIgnoreCase) ||
assetPath.EndsWith(".txt", StringComparison.OrdinalIgnoreCase) ||
assetPath.EndsWith(".xml", StringComparison.OrdinalIgnoreCase) ||
+ assetPath.EndsWith(".json", StringComparison.OrdinalIgnoreCase) ||
assetPath.EndsWith("._", StringComparison.Ordinal))
{
// Don't add assets for these files (shouldn't be necessary if/once we have a manifest in the runtime pack
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
index 5cb165803e20..aba0dd58eb4b 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
@@ -17,17 +17,6 @@ Copyright (c) .NET Foundation. All rights reserved.
-
-
-
-
-
false
diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs
index 6e79a5dcb522..c4203345062a 100644
--- a/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs
+++ b/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs
@@ -468,7 +468,6 @@ private ResolvedVersionInfo GetResolvedVersions(TestProject testProject,
testProject.IsSdkProject = true;
testProject.IsExe = true;
testProject.AdditionalProperties["DisableImplicitFrameworkReferences"] = "true";
- testProject.AdditionalProperties["UseRefTargetingPacks"] = "true";
testProject.RuntimeIdentifier = EnvironmentInfo.GetCompatibleRid(testProject.TargetFrameworks);
var testAsset = _testAssetsManager.CreateTestProject(testProject, callingMethod, identifier)
diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPreserveCompilationContext.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPreserveCompilationContext.cs
index 417060611226..6dc6938c71bf 100644
--- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPreserveCompilationContext.cs
+++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPreserveCompilationContext.cs
@@ -642,6 +642,7 @@ public void It_excludes_runtime_store_packages_from_the_refs_folder()
System.Resources.Writer.dll
System.Runtime.CompilerServices.VisualC.dll
System.Runtime.dll
+System.Runtime.CompilerServices.Unsafe.dll
System.Runtime.Extensions.dll
System.Runtime.Handles.dll
System.Runtime.InteropServices.dll