diff --git a/Directory.Build.props b/Directory.Build.props
index c0adfc01c6439b..7efd3a57291691 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -226,6 +226,9 @@
$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))
$([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))
$([MSBuild]::NormalizePath('$(MonoProjectRoot)', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))
+
+
+ true
diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets
index da9407c5090d0c..59b6c8c96e645e 100644
--- a/eng/targetingpacks.targets
+++ b/eng/targetingpacks.targets
@@ -15,15 +15,22 @@
+
+
diff --git a/eng/testing/linker/project.csproj.template b/eng/testing/linker/project.csproj.template
index 95298969cf61ad..7f8ccaba794415 100644
--- a/eng/testing/linker/project.csproj.template
+++ b/eng/testing/linker/project.csproj.template
@@ -10,6 +10,7 @@
{RepositoryEngineeringDir}
{NetCoreAppCurrent}
{RuntimeIdentifier}
+ {UseMonoRuntime}
{TargetingPackDir}
{NetCoreAppMaximumVersion}
{MicrosoftNETCoreAppVersion}
diff --git a/eng/testing/linker/trimmingTests.targets b/eng/testing/linker/trimmingTests.targets
index 0473cfcd03636c..f43dbee3b4e1f2 100644
--- a/eng/testing/linker/trimmingTests.targets
+++ b/eng/testing/linker/trimmingTests.targets
@@ -74,6 +74,7 @@
.Replace('{NetCoreAppMaximumVersion}', '$(NetCoreAppMaximumVersion)')
.Replace('{TargetingPackDir}','$(MicrosoftNetCoreAppRefPackDir)')
.Replace('{RuntimeIdentifier}','%(TestConsoleApps.TestRuntimeIdentifier)')
+ .Replace('{UseMonoRuntime}','$(UseMonoRuntime)')
.Replace('{MicrosoftNETILLinkTasksVersion}', '$(MicrosoftNETILLinkTasksVersion)')
.Replace('{ExtraTrimmerArgs}', '%(TestConsoleApps.ExtraTrimmerArgs)')
.Replace('{AdditionalProjectReferences}', '$(_additionalProjectReferencesString)')
diff --git a/global.json b/global.json
index 0d4187dbda82a1..a07e37e710976b 100644
--- a/global.json
+++ b/global.json
@@ -1,11 +1,11 @@
{
"sdk": {
- "version": "6.0.100-preview.3.21202.5",
+ "version": "6.0.100-preview.4.21255.9",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "6.0.100-preview.3.21202.5"
+ "dotnet": "6.0.100-preview.4.21255.9"
},
"native-tools": {
"cmake": "3.16.4",
diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props
index 0117eb8dbe3d84..4b18a3a329a2f4 100644
--- a/src/coreclr/Directory.Build.props
+++ b/src/coreclr/Directory.Build.props
@@ -7,6 +7,8 @@
Debug
Release
Checked
+
+ false
diff --git a/src/mono/sample/Android/AndroidSampleApp.csproj b/src/mono/sample/Android/AndroidSampleApp.csproj
index dd52a30abf241c..7dced61883747e 100644
--- a/src/mono/sample/Android/AndroidSampleApp.csproj
+++ b/src/mono/sample/Android/AndroidSampleApp.csproj
@@ -3,24 +3,13 @@
Exe
false
$(NetCoreAppToolCurrent)
- false
android-$(TargetArchitecture)
true
Link
- $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration)\runtimes\android-$(TargetArchitecture)\
+ $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration)\
false
-
-
-
-
- $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration)
-
-
-
-
-
@@ -75,7 +64,7 @@
ProjectName="HelloAndroid"
ForceInterpreter="$(MonoForceInterpreter)"
ForceAOT="$(ForceAOT)"
- MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)\native\include\mono-2.0"
+ MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)runtimes\android-$(TargetArchitecture)\native\include\mono-2.0"
Assemblies="@(BundleAssemblies)"
MainLibraryFileName="$(AssemblyName).dll"
StripDebugSymbols="$(StripDebugSymbols)"
diff --git a/src/mono/sample/Directory.Build.targets b/src/mono/sample/Directory.Build.targets
new file mode 100644
index 00000000000000..f72d0bc70d5c1f
--- /dev/null
+++ b/src/mono/sample/Directory.Build.targets
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/src/mono/sample/HelloWorld/HelloWorld.csproj b/src/mono/sample/HelloWorld/HelloWorld.csproj
index 15b0ef8697cbc8..db05235fce86c0 100644
--- a/src/mono/sample/HelloWorld/HelloWorld.csproj
+++ b/src/mono/sample/HelloWorld/HelloWorld.csproj
@@ -2,16 +2,5 @@
Exe
$(NetCoreAppToolCurrent)
- false
-
-
-
-
-
- $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration)
-
-
-
-
diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj
index b9718a6bdb5f24..362c5385f2304b 100644
--- a/src/mono/sample/iOS/Program.csproj
+++ b/src/mono/sample/iOS/Program.csproj
@@ -5,8 +5,7 @@
$(NetCoreAppToolCurrent)
iOS
iOSSimulator
- $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration)\runtimes\$(TargetOS.ToLower())-$(TargetArchitecture)\
- false
+ $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration)\
$(TargetOS.ToLower())-$(TargetArchitecture)
$(DefineConstants);CI_TEST
@@ -21,16 +20,6 @@
adhoc
-
-
-
-
- $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration)
-
-
-
-
-
@@ -80,7 +69,7 @@
TargetOS="$(TargetOS)"
Arch="$(TargetArchitecture)"
ProjectName="HelloiOS"
- MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)native\include\mono-2.0"
+ MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)runtimes\$(TargetOS.ToLower())-$(TargetArchitecture)\native\include\mono-2.0"
Assemblies="@(BundleAssemblies)"
MainLibraryFileName="Program.dll"
GenerateXcodeProject="True"
diff --git a/src/mono/sample/mbr/DeltaHelper/DeltaHelper.csproj b/src/mono/sample/mbr/DeltaHelper/DeltaHelper.csproj
index 47bb08e4c66e96..6a27072a4b5fed 100644
--- a/src/mono/sample/mbr/DeltaHelper/DeltaHelper.csproj
+++ b/src/mono/sample/mbr/DeltaHelper/DeltaHelper.csproj
@@ -1,6 +1,5 @@
$(NetCoreAppToolCurrent)
- false
diff --git a/src/mono/sample/mbr/apple/AppleDelta.csproj b/src/mono/sample/mbr/apple/AppleDelta.csproj
index 2b040dab21f005..090fe47dc7afa9 100644
--- a/src/mono/sample/mbr/apple/AppleDelta.csproj
+++ b/src/mono/sample/mbr/apple/AppleDelta.csproj
@@ -3,8 +3,7 @@
Exe
bin
$(NetCoreAppToolCurrent)
- $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration)\runtimes\$(TargetOS.ToLower())-$(TargetArchitecture)\
- false
+ $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration)\
$(TargetOS.ToLower())-$(TargetArchitecture)
$(DefineConstants);CI_TEST
true
@@ -29,16 +28,6 @@
-
-
-
-
-
- $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration)
-
-
-
-
-
@@ -63,7 +52,7 @@
TargetOS="$(TargetOS)"
Arch="$(TargetArchitecture)"
ProjectName="AppleDelta"
- MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)native\include\mono-2.0"
+ MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)runtimes\$(TargetOS.ToLower())-$(TargetArchitecture)\native\include\mono-2.0"
Assemblies="@(BundleAssemblies)"
NativeMainSource="$(MSBuildThisFileDirectory)\main.m"
MainLibraryFileName="AppleDelta.dll"
diff --git a/src/mono/sample/mbr/console/ConsoleDelta.csproj b/src/mono/sample/mbr/console/ConsoleDelta.csproj
index 04059b0272b7f6..195513429594cb 100644
--- a/src/mono/sample/mbr/console/ConsoleDelta.csproj
+++ b/src/mono/sample/mbr/console/ConsoleDelta.csproj
@@ -2,7 +2,6 @@
Exe
$(NetCoreAppToolCurrent)
- false
false
@@ -21,17 +20,6 @@
1
-
-
-
-
- $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(BuiltRuntimeConfiguration)
-
-
-
-
-
-
diff --git a/src/tests/Common/scripts/scripts.csproj b/src/tests/Common/scripts/scripts.csproj
index c7b9426b098610..35f48e7f11ae85 100644
--- a/src/tests/Common/scripts/scripts.csproj
+++ b/src/tests/Common/scripts/scripts.csproj
@@ -1,33 +1,15 @@
-
-
-
-
-
- 1.0.0-alpha-build0040
-
-
- 1.0.0-alpha-build0040
-
-
- 1.0.0-alpha-build0040
-
-
- 1.0.0-alpha-build0040
-
-
- $(MicrosoftDotNetXUnitConsoleRunnerVersion)
-
-
- 1.0.0-prerelease-00629-04
-
-
+
netstandard1.3
- .NETStandard
win7-x86;win7-x64
false
-
-
+
+
+
diff --git a/src/tests/Loader/binding/tracing/BinderTracingTest.targets b/src/tests/Loader/binding/tracing/BinderTracingTest.targets
index 732b2ce139923b..426a5556093f14 100644
--- a/src/tests/Loader/binding/tracing/BinderTracingTest.targets
+++ b/src/tests/Loader/binding/tracing/BinderTracingTest.targets
@@ -40,9 +40,9 @@
fr-FR
-
+
-
+