Update dotnet SDK to 6.0 Preview 4 #53808
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update the minimum and target version of the SDK to 6.0 Preview 4. Part of #53411
|
Tagging subscribers to this area: @Anipik, @safern, @ViktorHofer Issue DetailsUpdate the minimum and target version of the SDK to 6.0 Preview 4. Part of #53411
|
ghost
added this to In Progress
in
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure Issue DetailsUpdate the minimum and target version of the SDK to 6.0 Preview 4. Part of #53411
|
…ck location in src/mono/sample
|
A loader test is now failing consistently with the SDK upgrade: @jkotas @BruceForstall @agocke who would be the best person to take a look? |
|
Looks like @elinor-fung knows this test |
|
The binder test uses project references and 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 Will look at making the test work with this. |
…me packs This is necessary after the changes from dotnet/sdk#16909.
akoeplinger
approved these changes
Jun 10, 2021
ViktorHofer
commented
Jun 10, 2021
eng/Subsets.props
Outdated
| @@ -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> | |||
There was a problem hiding this comment.
can you please move that property out of Subsets.props into Directory.Build.props to the feature switches?
Line 205 in b52d276
There was a problem hiding this comment.
Done. I couldn't put it in Feature switches since it needs the Subsets.props import which is after that one.
lambdageek
reviewed
Jun 11, 2021
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> |
There was a problem hiding this comment.
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update the minimum and target version of the SDK to 6.0 Preview 4.
Part of #53411