diff --git a/Make.config b/Make.config index 8c14902955b7..e1f24569c81a 100644 --- a/Make.config +++ b/Make.config @@ -133,7 +133,7 @@ endif ## change *first*, otherwise we'll produce builds with the same version from ## two different branches (which is very, very bad). ## -NUGET_HARDCODED_PRERELEASE_IDENTIFIER=rc.1 +NUGET_HARDCODED_PRERELEASE_IDENTIFIER=rc.2 NUGET_HARDCODED_PRERELEASE_BRANCH=net7.0 # compute the alphanumeric version of branch names diff --git a/dotnet/targets/Xamarin.Shared.Sdk.props b/dotnet/targets/Xamarin.Shared.Sdk.props index 05635ec5d87d..d710f6276662 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.props +++ b/dotnet/targets/Xamarin.Shared.Sdk.props @@ -18,8 +18,6 @@ <_XamarinTaskAssembly Condition="'$(_PlatformName)' != 'macOS'">$(_XamarinSdkRootDirectory)\tools\msbuild\iOS\Xamarin.iOS.Tasks.dll <_XamarinTaskAssembly Condition="'$(_PlatformName)' == 'macOS'">$(_XamarinSdkRootDirectory)\tools\msbuild\macOS\Xamarin.Mac.Tasks.dll true - - partial $(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Microsoft.$(_PlatformName).Sdk.targets diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index a0df14724028..0cdede9c518b 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.targets @@ -395,6 +395,7 @@ <_MonoComponent Include="hot_reload" Condition="'$(MtouchInterpreter)' == 'true'" /> <_MonoComponent Include="debugger" Condition="'$(_BundlerDebug)' == 'true'" /> <_MonoComponent Include="diagnostics_tracing" Condition="'$(_BundlerDebug)' == 'true'" /> + <_MonoComponent Include="marshal-ilgen" /> @@ -554,6 +555,9 @@ <_ExtraTrimmerArgs Condition="('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS') And '$(_SdkIsSimulator)' == 'true'">$(_ExtraTrimmerArgs) --feature ObjCRuntime.Runtime.Arch.IsSimulator true <_ExtraTrimmerArgs Condition="('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS') And '$(_SdkIsSimulator)' != 'true'">$(_ExtraTrimmerArgs) --feature ObjCRuntime.Runtime.Arch.IsSimulator false + + <_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --enable-serialization-discovery + false diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae2aeff9b4ff..627189441d52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - 785bddf6a55f6e826f92a46e0464c01ff41481c1 + f3da421a6e81382d6d2b25b236697f33e210092c - + https://github.com/dotnet/linker - f09bacf09ef10b61cf9f19825f8782171a816dab + 6252a2194dd32911db2c0669fc818555687d5570 - + https://github.com/dotnet/runtime - 26a71c61fbda229f151afb14e274604b4926df5c + f52d8c59bb49360eb2cbeeb863c5856ebd62adda - + https://github.com/dotnet/aspnetcore - 80ea57377a90fa2750f46662be3642b59ad0feed + 0438e7ec04808230c67b00caa3d584bd2b991f57 diff --git a/eng/Versions.props b/eng/Versions.props index 94476b57e12d..6265526830e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.100-rc.1.22405.9 - 7.0.100-1.22377.1 + 7.0.100-rc.2.22417.1 + 7.0.100-1.22415.4 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 - 7.0.0-rc.1.22403.8 + 7.0.0-rc.1.22411.12 7.0.100-alpha.1.21601.1 diff --git a/global.json b/global.json index ed0b6425ccb9..025227828f21 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22405.9" + "version": "7.0.100-rc.2.22417.1" } } diff --git a/tests/common/DotNet.cs b/tests/common/DotNet.cs index fea7dffa7515..119aafe82552 100644 --- a/tests/common/DotNet.cs +++ b/tests/common/DotNet.cs @@ -120,6 +120,7 @@ public static ExecutionResult Execute (string verb, string project, Dictionary generatedProps = null; foreach (var prop in properties) { if (prop.Value.IndexOfAny (new char [] { ';' }) >= 0) { // https://github.com/dotnet/msbuild/issues/471 @@ -128,11 +129,34 @@ public static ExecutionResult Execute (string verb, string project, Dictionary (); + generatedProps.Add (prop.Key, prop.Value); } else { args.Add ($"/p:{prop.Key}={prop.Value}"); } } + if (generatedProps is not null) { + var sb = new StringBuilder (); + sb.AppendLine (""); + sb.AppendLine (""); + sb.AppendLine ("\t"); + foreach (var prop in generatedProps) { + sb.AppendLine ($"\t\t<{prop.Key}>{prop.Value}"); + } + sb.AppendLine ("\t"); + sb.AppendLine (""); + + var generatedProjectFile = Path.Combine (Cache.CreateTemporaryDirectory (), "GeneratedProjectFile.props"); + File.WriteAllText (generatedProjectFile, sb.ToString ()); + args.Add ($"/p:GeneratedProjectFile={generatedProjectFile}"); + } } if (!string.IsNullOrEmpty (target)) args.Add ("/t:" + target); diff --git a/tests/common/shared-dotnet.csproj b/tests/common/shared-dotnet.csproj index 3634816ebc43..c1a0405e622d 100644 --- a/tests/common/shared-dotnet.csproj +++ b/tests/common/shared-dotnet.csproj @@ -64,4 +64,6 @@ + + diff --git a/tests/dotnet/UnitTests/BundleStructureTest.cs b/tests/dotnet/UnitTests/BundleStructureTest.cs index 8b6c24b5f8ce..9f0b5bfb1575 100644 --- a/tests/dotnet/UnitTests/BundleStructureTest.cs +++ b/tests/dotnet/UnitTests/BundleStructureTest.cs @@ -46,6 +46,7 @@ void CheckAppBundleContents (ApplePlatform platform, string appPath, string[] ru var fn = Path.GetFileName (v!); switch (fn) { + case "libclrgc.dylib": case "libclrjit.dylib": case "libcoreclr.dylib": case "libdbgshim.dylib": @@ -57,6 +58,7 @@ void CheckAppBundleContents (ApplePlatform platform, string appPath, string[] ru case "libmono-component-debugger.dylib": case "libmono-component-diagnostics_tracing.dylib": case "libmono-component-hot_reload.dylib": + case "libmono-component-marshal-ilgen.dylib": case "libmonosgen-2.0.dylib": return platform != ApplePlatform.MacOSX; case "libSystem.Native.dylib": diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs index 9f43a3d9a767..063a9ef52478 100644 --- a/tests/dotnet/UnitTests/ProjectTest.cs +++ b/tests/dotnet/UnitTests/ProjectTest.cs @@ -487,10 +487,10 @@ public void InvalidRuntimeIdentifier (ApplePlatform platform, string runtimeIden } [Test] - [TestCase (ApplePlatform.iOS, "win10-x86", null)] - [TestCase (ApplePlatform.TVOS, "win10-x64", null)] + [TestCase (ApplePlatform.iOS, "win10-x86", "Error getting pack version: Pack 'Microsoft.NETCore.App.Runtime.Mono.win-x86' was not present in workload manifests.")] + [TestCase (ApplePlatform.TVOS, "win10-x64", "Error getting pack version: Pack 'Microsoft.NETCore.App.Runtime.Mono.win-x64' was not present in workload manifests.")] [TestCase (ApplePlatform.MacOSX, "win10-arm", null)] - [TestCase (ApplePlatform.MacCatalyst, "win10-arm64", "Unable to find package Microsoft.NETCore.App.Runtime.Mono.win-arm64. No packages exist with this id in source[(]s[)]:.*")] + [TestCase (ApplePlatform.MacCatalyst, "win10-arm64", "Error getting pack version: Pack 'Microsoft.NETCore.App.Runtime.Mono.win-arm64' was not present in workload manifests.")] public void InvalidRuntimeIdentifier_Restore (ApplePlatform platform, string runtimeIdentifier, string? failureMessagePattern) { var project = "MySimpleApp"; diff --git a/tests/linker/ios/dont link/dotnet/shared.csproj b/tests/linker/ios/dont link/dotnet/shared.csproj index 610303c294ea..3273f4efc285 100644 --- a/tests/linker/ios/dont link/dotnet/shared.csproj +++ b/tests/linker/ios/dont link/dotnet/shared.csproj @@ -6,6 +6,7 @@ dontlink dont link None + $(MtouchLink) $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\..\..\..')) $(RootTestsDirectory)\linker\ios\dont link diff --git a/tests/linker/ios/trimmode copy/dotnet/shared.csproj b/tests/linker/ios/trimmode copy/dotnet/shared.csproj index fd5ec5a5d81a..df28e608d26e 100644 --- a/tests/linker/ios/trimmode copy/dotnet/shared.csproj +++ b/tests/linker/ios/trimmode copy/dotnet/shared.csproj @@ -7,6 +7,7 @@ trimmode copy TrimMode Copy copy + <_TrimmerDefaultAction>copy $([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\..\..\..\..\..')) $(RootTestsDirectory)\linker\ios\dont link