Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dotnet SDK to 6.0 Preview 4 #53808

Merged
merged 7 commits into from
Jun 11, 2021
Merged

Update dotnet SDK to 6.0 Preview 4 #53808

merged 7 commits into from
Jun 11, 2021

Conversation

ViktorHofer
Copy link
Member

Update the minimum and target version of the SDK to 6.0 Preview 4.

Part of #53411

Update the minimum and target version of the SDK to 6.0 Preview 4.

Part of #53411
@ghost
Copy link

ghost commented Jun 7, 2021

Tagging subscribers to this area: @Anipik, @safern, @ViktorHofer
See info in area-owners.md if you want to be subscribed.

Issue Details

Update the minimum and target version of the SDK to 6.0 Preview 4.

Part of #53411

Author: ViktorHofer
Assignees: ViktorHofer
Labels:

area-Infrastructure-libraries

Milestone: -

@ghost
Copy link

ghost commented Jun 7, 2021

Tagging subscribers to this area: @dotnet/runtime-infrastructure
See info in area-owners.md if you want to be subscribed.

Issue Details

Update the minimum and target version of the SDK to 6.0 Preview 4.

Part of #53411

Author: ViktorHofer
Assignees: ViktorHofer
Labels:

area-Infrastructure

Milestone: -

@ViktorHofer
Copy link
Member Author

A loader test is now failing consistently with the SDK upgrade:

Loader/binding/tracing/BinderTracingTest.Basic/BinderTracingTest.Basic.sh

Return code:      1
Raw output file:      /tmp/helix/working/AEF7094F/w/A25509A3/uploads/Reports/Loader.binding/tracing/BinderTracingTest.Basic/BinderTracingTest.Basic.output.txt
Raw output:
BEGIN EXECUTION
/tmp/helix/working/AEF7094F/p/corerun BinderTracingTest.Basic.dll ''
[4:47:35 AM] Running LoadFile...
[4:47:35 AM] Running LoadBytes...
[4:47:36 AM] Running LoadFromStream...
[4:47:36 AM] Running LoadFromAssemblyPath...
[4:47:36 AM] Launching process for LoadFromAssemblyName...
[4:47:36 AM] Running LoadFromAssemblyName...

[4:47:37 AM] Launching process for LoadFrom...
[4:47:37 AM] Running LoadFrom...

[4:47:37 AM] Launching process for PlatformAssembly...
[4:47:37 AM] Running PlatformAssembly...

[4:47:38 AM] Launching process for PlatformAssembly_Cached...
[4:47:38 AM] Running PlatformAssembly_Cached...

[4:47:38 AM] Launching process for Reflection...
[4:47:38 AM] Running Reflection...

[4:47:39 AM] Launching process for Reflection_Cached...
[4:47:39 AM] Running Reflection_Cached...

[4:47:40 AM] Launching process for Reflection_CustomALC...
[4:47:40 AM] Running Reflection_CustomALC...

[4:47:40 AM] Launching process for ContextualReflection_DefaultToCustomALC...
[4:47:40 AM] Running ContextualReflection_DefaultToCustomALC...

[4:47:41 AM] Launching process for ContextualReflection_CustomToDefaultALC...
[4:47:41 AM] Running ContextualReflection_CustomToDefaultALC...

[4:47:41 AM] Launching process for JITLoad...
[4:47:41 AM] Running JITLoad...

[4:47:42 AM] Launching process for JITLoad_CustomALC...
[4:47:42 AM] Running JITLoad_CustomALC...

[4:47:42 AM] Running AssemblyInAppPath...
[4:47:43 AM] Running NonExistentAssembly...
[4:47:43 AM] Launching process for SatelliteAssembly_AppPath...
[4:47:43 AM] Running SatelliteAssembly_AppPath...

[4:47:43 AM] Running SatelliteAssembly_CultureSubdirectory...
Test SatelliteAssembly_CultureSubdirectory failed: System.IO.FileNotFoundException: Could not load file or assembly 'AssemblyToLoad_Subdirectory.resources, Culture=fr-FR, PublicKeyToken=null'. The system cannot find the file specified.

File name: 'AssemblyToLoad_Subdirectory.resources, Culture=fr-FR, PublicKeyToken=null'
at System.Reflection.RuntimeAssembly.InternalLoad(ObjectHandleOnStack assemblyName, ObjectHandleOnStack requestingAssembly, StackCrawlMarkHandle stackMark, Boolean throwOnFileNotFound, ObjectHandleOnStack assemblyLoadContext, ObjectHandleOnStack retAssembly) in System.Private.CoreLib.dll:token 0x6004cd3+0x8
at System.Reflection.RuntimeAssembly.InternalLoad(AssemblyName assemblyName, RuntimeAssembly requestingAssembly, StackCrawlMark& stackMark, Boolean throwOnFileNotFound, AssemblyLoadContext assemblyLoadContext) in System.Private.CoreLib.dll:token 0x6004cd2+0x16
at System.Runtime.Loader.AssemblyLoadContext.LoadFromAssemblyName(AssemblyName assemblyName) in System.Private.CoreLib.dll:token 0x6003564+0xe
at BinderTracingTests.BinderTracingTest.SatelliteAssembly_CultureSubdirectory() in BinderTracingTest.Basic.dll:token 0x6000013+0x33
at BinderTracingTests.BinderTracingTest.RunSingleTest(MethodInfo method) in BinderTracingTest.Basic.dll:token 0x600001c+0xd8
Expected: 100
Actual: 101
END EXECUTION - FAILED
Test Harness Exitcode is : 1
To run the test:

set CORE_ROOT=/tmp/helix/working/AEF7094F/p
/private/tmp/helix/working/AEF7094F/w/A25509A3/e/Loader/binding/tracing/BinderTracingTest.Basic/BinderTracingTest.Basic.sh
Expected: True
Actual:   False

@jkotas @BruceForstall @agocke who would be the best person to take a look?

@BruceForstall
Copy link
Member

Looks like @elinor-fung knows this test

@elinor-fung
Copy link
Member

The binder test uses project references and SatelliteDllsProjectOutputGroup to copy the satellite DLL from another project to its output directory. It then copies that satellite DLL from its output directory into a specific subdirectory.

With Preview 4, it looks like the satellite DLL is now placed in a subdirectory of the test project's output directory (instead of directly in the output directory) as a result of a change in the AssignTargetsPath task: dotnet/msbuild#6237

Will look at making the test work with this.

@@ -39,6 +39,9 @@
<RuntimeFlavor Condition="'$(TargetsMobile)' == 'true'">Mono</RuntimeFlavor>
<RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and ($(_subset.Contains('+mono+')) or $(_subset.Contains('+mono.runtime+'))) and (!$(_subset.Contains('+clr+')) and !$(_subset.Contains('+clr.runtime+')))">Mono</RuntimeFlavor>
<RuntimeFlavor Condition="'$(RuntimeFlavor)' == ''">CoreCLR</RuntimeFlavor>

<!-- this property is used by the SDK to pull in mono-based runtime packs -->
<UseMonoRuntime Condition="'$(UseMonoRuntime)' == '' and '$(RuntimeFlavor)' == 'Mono'">true</UseMonoRuntime>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you please move that property out of Subsets.props into Directory.Build.props to the feature switches?

<!--Feature switches -->

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. I couldn't put it in Feature switches since it needs the Subsets.props import which is after that one.

@ViktorHofer ViktorHofer merged commit 8698d0f into main Jun 11, 2021
@ViktorHofer ViktorHofer deleted the ViktorHofer-patch-1 branch June 11, 2021 16:55
Comment on lines -8 to -16
<!-- Redirect 'dotnet publish' to in-tree runtime pack -->
<Target Name="TrickRuntimePackLocation" AfterTargets="ProcessFrameworkReferences">
<ItemGroup>
<RuntimePack>
<PackageDirectory>$(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration)</PackageDirectory>
</RuntimePack>
</ItemGroup>
<Message Text="Packaged ID: %(RuntimePack.PackageDirectory)" Importance="high" />
</Target>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViktorHofer

This broke the mono samples. Am I missing something? (I did: ./build.sh mono+libs -c Release to build)

$ make run MONO_CONFIG=Release
../../../.././dotnet.sh publish -c Release -r osx-x64
Microsoft (R) Build Engine version 17.0.0-preview-21302-02+018bed83d for .NET
Copyright (C) Microsoft Corporation. All rights reserved.

  Determining projects to restore...
  All projects are up-to-date for restore.
  Used runtime pack:
  Used runtime pack: /Users/alklig/.nuget/packages/microsoft.aspnetcore.app.runtime.osx-x64/6.0.0-preview.5.21301.17
/usr/local/share/dotnet/sdk/6.0.100-preview.5.21302.13/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets(391,5): error NETSDK1112: The runtime pack for Microsoft.NETCore.App.Runtime.Mono.osx-x64 was not downloaded. Try running a NuGet restore with the RuntimeIdentifier 'osx-x64'. [/Users/alklig/work/dotnet-runtime/delta-bugs/src/mono/sample/HelloWorld/HelloWorld.csproj]
make: *** [publish] Error 1

@ghost ghost locked as resolved and limited conversation to collaborators Jul 11, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants