EditorFeatures.Cocoa: Build with net6.0 #59429

sandyarmstrong · 2022-02-09T20:45:38Z

Use macos workload 12.1.200-preview.13.7. Necessitates bumping the editor and several other packages to 17.2 (17.1.387 might also be OK for editor).

Build with public editor packages
Install proper macos workload version
Local builds working
Build_Windows* CI jobs working
Source-Build CI jobs working
Correctness_Determinism CI jobs working (need to ensure macos workload installed in this scenario)
~~Adapt workload installation script for bash (unless we can use pwsh in unix pipelines?)~~

sandyarmstrong · 2022-02-09T20:49:46Z

@KirillOsenkov @Therzok @davidwengier @tmat jfyi. I'm not sure exactly when this will be ready for review. We'll likely need it for your 17.2.

davidwengier · 2022-02-09T20:53:11Z

main is targetting 17.2 so this is good on that front. I'm not planning another VS Mac insertion until after Feb 25 due to scheduling (and realistically not till after March 6 because I'll be on holidays) so there is plenty of time.

sandyarmstrong · 2022-02-17T17:05:56Z

##[error]C:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.RestoreEx.targets(19,5): error : (NETCORE_ENGINEERING_TELEMETRY=Restore) The expression "[MSBuild]::MakeRelative(D:\a_work\1\s\src\EditorFeatures\Core.Cocoa, *.plist)" cannot be evaluated. Illegal characters in path. D:\a_work\1\s.dotnet\packs\Microsoft.macOS.Sdk\12.1.302-preview.14.6\targets\Microsoft.macOS.Sdk.DefaultItems.props

https://github.com/xamarin/xamarin-macios/blob/main/dotnet/targets/Microsoft.Sdk.DefaultItems.template.props#L23

I wonder what this is about. Anyway, I'll need to fix that P14 of the macos workload is being used instead of P13.

src/EditorFeatures/Core.Cocoa/Preview/PreviewPane.cs

sandyarmstrong · 2022-02-24T19:09:39Z

I used a backport of this PR to bring this into VSMac.

To finish this PR, I need to get a few editor packages published. Should be able to get that done next week after some signing infrastructure issues are addressed.

eng/build.ps1

eng/Install-DotNetWorkloads.ps1

sandyarmstrong · 2022-03-03T00:55:59Z

I had previously done work inside eng\common to ensure that initializing a .NET "Core" installation also initializes workloads. I am now trying to keep all changes out of there to avoid having a dependency on a newer Arcade. This may mean having to sprinkle workload initialization in a couple of extra places.

In the long run, workload management may move to be a common Arcade feature.

eng/Versions.props

eng/build.sh

eng/Versions.props

src/EditorFeatures/Core.Cocoa/Microsoft.CodeAnalysis.EditorFeatures.Cocoa.csproj

global.json

eng/Install-DotNetWorkloads.ps1

Also switch ps1 to 2 space indenting.

In CI, we keep seeing errors like: ``` Workload installation failed: Failed to validate package signing. Verifying Microsoft.NET.Runtime.MonoAOTCompiler.Task.6.0.2-mauipre.1.22102.15 error: NU3004: The package is not signed. Package signature validation failed. ``` This is presumably happening because NuGet.config references multiple feeds, some of which have signed versions of workload packages, and some of which have unsigned versions. We can untangle this later. For now, change EditorFeatures.Cocoa to target `net6.0` instead of `net6.0-macos`, and manually reference the assemblies it needs from the macos SDK and the VS editor.

davidwengier · 2022-03-17T06:12:08Z

/azp run

azure-pipelines · 2022-03-17T06:12:30Z

Azure Pipelines successfully started running 4 pipeline(s).

sandyarmstrong · 2022-03-17T13:33:39Z

When I rebased yesterday I think there was only one failure. After your /azp run there are more. Do we just /azp run until it turns green?

davidwengier · 2022-03-17T20:30:48Z

Odd. When I did the azp run I'm 90% sure all of the various integration tests were failing. If it was just one, I normally just re-run that one /azp run <leg name>

Generally speaking, yes we're in a bit of a "re-run until they turn green" situation, though with new editor APIs it is worth at least checking if the failures are consistent, and investigating. Looks like the GoToBaseFromMetadataAsSource test failure could be real. Will have a look and see what i can work out. @sharwell don't suppose you can quickly check the history and see if any of your recent fixes are missing from main-vs-deps?

davidwengier · 2022-03-17T23:06:43Z

The stack in the Go To Base test failure seems to imply an issue with the shell:

System.ArgumentException : Value does not fall within the expected range.
   at System.Runtime.InteropServices.Marshal.ThrowExceptionForHRInternal(Int32 errorCode, IntPtr errorInfo)
   at Microsoft.VisualStudio.Extensibility.Testing.ShellInProcess.<ExecuteCommandAsync>d__10.MoveNext()
--- End of stack trace from previous location where exception was thrown ---
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
   at Microsoft.VisualStudio.Extensibility.Testing.EditorInProcess.<GoToBaseAsync>d__48.MoveNext() in /_/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/EditorInProcess.cs:line 965
--- End of stack trace from previous location where exception was thrown ---
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
   at Roslyn.VisualStudio.NewIntegrationTests.CSharp.CSharpGoToBase.<GoToBaseFromMetadataAsSource>d__3.MoveNext() in /_/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpGoToBase.cs:line 39
--- End of stack trace from previous location where exception was thrown ---
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
   at System.Runtime.CompilerServices.TaskAwaiter.GetResult()
--- End of stack trace from previous location where exception was thrown ---
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
--- End of stack trace from previous location where exception was thrown ---
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)

It runs fine and passes on my machine, but that probably doesn't mean much. @sharwell any ideas? Is this the first test run with the new Guid attribute being applied to the EditorConstants.EditorCommandID type? Though if that was causing a failure, I would expect it to fail locally for me too.

davidwengier · 2022-03-18T03:08:09Z

Okay, everything is green.. stand back, I'm gonna merge it!

sandyarmstrong · 2022-03-18T04:14:35Z

Thanks David!

RikkiGibson · 2022-03-29T19:43:37Z

What version of VS is needed to work with these changes? Trying to figure out the expected lifetime of the -vs-deps branch here.

KirillOsenkov · 2022-03-29T19:58:38Z

you mean VSWin or VSMac?

RikkiGibson · 2022-03-29T22:19:05Z

Just VSWin, I think. Once a public preview comes out which can F5 successfully on whatever we have in main-vs-deps, we'd like to shut down the -vs-deps branch and go back to just shipping out of main.

dotnet-issue-labeler bot added the Area-Infrastructure label Feb 9, 2022

Therzok approved these changes Feb 10, 2022

View reviewed changes

sandyarmstrong force-pushed the dev/sandy/cocoa-net6 branch 2 times, most recently from 8e417c7 to e3cbe65 Compare February 17, 2022 05:15

Therzok reviewed Feb 17, 2022

View reviewed changes

src/EditorFeatures/Core.Cocoa/Preview/PreviewPane.cs Show resolved Hide resolved

Therzok approved these changes Feb 17, 2022

View reviewed changes

sandyarmstrong force-pushed the dev/sandy/cocoa-net6 branch from d44a16a to c9bd537 Compare February 20, 2022 01:51

sandyarmstrong force-pushed the dev/sandy/cocoa-net6 branch 2 times, most recently from 30fa881 to f40f22c Compare March 1, 2022 20:48

sandyarmstrong commented Mar 1, 2022

View reviewed changes

eng/build.ps1 Outdated Show resolved Hide resolved

sandyarmstrong force-pushed the dev/sandy/cocoa-net6 branch 2 times, most recently from 3c6cceb to 9cf9d71 Compare March 2, 2022 21:16

sandyarmstrong commented Mar 2, 2022

View reviewed changes

eng/Install-DotNetWorkloads.ps1 Outdated Show resolved Hide resolved

sandyarmstrong force-pushed the dev/sandy/cocoa-net6 branch 2 times, most recently from 2f93672 to a28402a Compare March 3, 2022 00:52

sandyarmstrong commented Mar 3, 2022

View reviewed changes

eng/Versions.props Show resolved Hide resolved

jmarolf reviewed Mar 3, 2022

View reviewed changes

eng/Versions.props Outdated Show resolved Hide resolved

sandyarmstrong marked this pull request as ready for review March 3, 2022 02:14

sandyarmstrong requested review from a team as code owners March 3, 2022 02:14

sandyarmstrong commented Mar 3, 2022

View reviewed changes

eng/build.sh Outdated Show resolved Hide resolved

sandyarmstrong mentioned this pull request Mar 3, 2022

Improve workloads versioning dotnet/sdk#22151

Closed

runfoapp bot mentioned this pull request Mar 3, 2022

Failure in CSharpCodeActions.GFUFuzzyMatchAfterRenameTrackingAndAfterGenerateType #57423

Closed

jasonmalinowski reviewed Mar 7, 2022

View reviewed changes

sandyarmstrong and others added 13 commits March 16, 2022 14:04

Build: Use approved nuget feeds to get macos workload

0f63dfa

Build: Add Install-DotNetWorkloads.sh first pass

2b73dbb

testing

5a78c64

Build: Use nuget.config to install workloads, fix global.json parsing

466a2b1

Also switch ps1 to 2 space indenting.

Use the powershell script from build.sh

a091aa8

Build: restore tools during source builds as well

6bf0b4e

Avoid path issues by invoking pwsh with dotnet tool run pwsh

c7eaa6a

Fix typo from conflict resolution

361879d

Try to fix Correctness_Build

4d23e42

Add comment

abd3c7a

Remove workload support from build

546c94b

Update comments

fcf1314

sandyarmstrong force-pushed the dev/sandy/cocoa-net6 branch from a5219ac to fcf1314 Compare March 16, 2022 21:05

Try to work around test failure

dcea7c8

davidwengier merged commit a83e2ad into main-vs-deps Mar 18, 2022

davidwengier deleted the dev/sandy/cocoa-net6 branch March 18, 2022 03:08

ghost added this to the Next milestone Mar 18, 2022

allisonchou modified the milestones: Next, 17.2.P3 Mar 28, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

EditorFeatures.Cocoa: Build with net6.0 #59429

EditorFeatures.Cocoa: Build with net6.0 #59429

sandyarmstrong commented Feb 9, 2022 •

edited

Loading

sandyarmstrong commented Feb 9, 2022

davidwengier commented Feb 9, 2022

sandyarmstrong commented Feb 17, 2022 •

edited

Loading

sandyarmstrong commented Feb 24, 2022

sandyarmstrong commented Mar 3, 2022 •

edited

Loading

davidwengier commented Mar 17, 2022

azure-pipelines bot commented Mar 17, 2022

sandyarmstrong commented Mar 17, 2022

davidwengier commented Mar 17, 2022 •

edited

Loading

davidwengier commented Mar 17, 2022

davidwengier commented Mar 18, 2022

sandyarmstrong commented Mar 18, 2022

RikkiGibson commented Mar 29, 2022

KirillOsenkov commented Mar 29, 2022

RikkiGibson commented Mar 29, 2022

EditorFeatures.Cocoa: Build with net6.0 #59429

EditorFeatures.Cocoa: Build with net6.0 #59429

Conversation

sandyarmstrong commented Feb 9, 2022 • edited Loading

sandyarmstrong commented Feb 9, 2022

davidwengier commented Feb 9, 2022

sandyarmstrong commented Feb 17, 2022 • edited Loading

sandyarmstrong commented Feb 24, 2022

sandyarmstrong commented Mar 3, 2022 • edited Loading

davidwengier commented Mar 17, 2022

azure-pipelines bot commented Mar 17, 2022

sandyarmstrong commented Mar 17, 2022

davidwengier commented Mar 17, 2022 • edited Loading

davidwengier commented Mar 17, 2022

davidwengier commented Mar 18, 2022

sandyarmstrong commented Mar 18, 2022

RikkiGibson commented Mar 29, 2022

KirillOsenkov commented Mar 29, 2022

RikkiGibson commented Mar 29, 2022

sandyarmstrong commented Feb 9, 2022 •

edited

Loading

sandyarmstrong commented Feb 17, 2022 •

edited

Loading

sandyarmstrong commented Mar 3, 2022 •

edited

Loading

davidwengier commented Mar 17, 2022 •

edited

Loading