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

Merge branch 'release/9.0.2xx' => 'main' #45427

Merged
merged 1,099 commits into from
Dec 18, 2024
Merged

Merge branch 'release/9.0.2xx' => 'main' #45427

merged 1,099 commits into from
Dec 18, 2024

Conversation

v-wuzhai
Copy link
Member

No description provided.

v-wuzhai and others added 30 commits November 25, 2024 17:33
…0241125.3

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 9.0.101-servicing.24565.5 -> To Version 9.0.102-servicing.24575.3
…ld 20241125.2

Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0
 From Version 1.1.0-rtm.24570.2 -> To Version 1.1.0-rtm.24575.2
…ld 20241125.2

Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0
 From Version 1.1.0-rtm.24570.2 -> To Version 1.1.0-rtm.24575.2
…ld 20241125.3

Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0
 From Version 1.1.0-rtm.24570.2 -> To Version 1.1.0-rtm.24575.3
…ld 20241125.3

Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0
 From Version 1.1.0-rtm.24570.2 -> To Version 1.1.0-rtm.24575.3
…0241125.2

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.405-servicing.24573.7 -> To Version 8.0.405-servicing.24575.2
…25.2

Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 9.0.0-preview.24574.8 -> To Version 9.0.0-preview.24575.2
…125.2

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.13.0-3.24574.9 -> To Version 4.13.0-3.24575.2
…0241125.1

Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab
 From Version 9.0.0-beta.24574.1 -> To Version 9.0.0-beta.24575.1
…125.5

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.13.0-3.24574.9 -> To Version 4.13.0-3.24575.5
…125.6

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.13.0-3.24574.9 -> To Version 4.13.0-3.24575.6
…25.4

Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 9.0.0-preview.24574.8 -> To Version 9.0.0-preview.24575.4
…125.7

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24575.7
…125.8

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.13.0-3.24575.6 -> To Version 4.13.0-3.24575.8
@ViktorHofer
Copy link
Member

src/roslyn/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(217,13): error CS1503: (NETCORE_ENGINEERING_TELEMETRY=Build) Argument 4: cannot convert from 'System.Collections.Immutable.ImmutableHashSet<Microsoft.CodeAnalysis.Project>' to 'System.Collections.Generic.IReadOnlySet<Microsoft.CodeAnalysis.Project>'

@tmat can you please take a look at the dotnet watch VMR source-build failures?

@ViktorHofer
Copy link
Member

Unable to locate executable file: 'pwsh'. Please verify either the file path exists or the file can be found within a directory specified by the PATH environment variable. Also check the file mode to verify the file is executable.

Failing in the Ubuntu DevVersions leg. @premun any idea?

@ViktorHofer
Copy link
Member

ViktorHofer commented Dec 17, 2024

And last but not least:

No templates or subcommands found matching: 'nunit'.
    Did you mean one of the following templates?
       dotnet new nunit-test

@Evangelink something is wrong when using the nunit-test template from the SDK during the VMR integration-tests.

@ViktorHofer
Copy link
Member

ViktorHofer commented Dec 17, 2024

https://aka.ms/templating-exit-codes#103
< /datadisks/disk1/work/ADDA0970/p/d/dotnet new --debug:ephemeral-hive nunit --no-restore exited with 103 in 907 ms.
[xUnit.net 00:00:44.57]     EndToEnd.Tests.ProjectBuildTests.ItCanCreateAndBuildTemplatesWithDefaultFramework(templateName: "nunit", language: "") [OUTPUT] Command 'dotnet new --debug:ephemeral-hive nunit --no-restore' exited with exit code 103.
Running /datadisks/disk1/work/ADDA0970/p/d/dotnet new --debug:ephemeral-hive nunit --no-restore --language F#
> /datadisks/disk1/work/ADDA0970/p/d/dotnet new --debug:ephemeral-hive nunit --no-restore --language F#
Process ID: 72644
[xUnit.net 00:00:44.62]     EndToEnd.Tests.ProjectBuildTests.ItCanCreateAndBuildTemplatesWithDefaultFramework(templateName: "nunit", language: "") [FAIL]
[xUnit.net 00:00:44.62]       Expected command to pass but it did not.
[xUnit.net 00:00:44.62]       File Name: /datadisks/disk1/work/ADDA0970/p/d/dotnet
[xUnit.net 00:00:44.62]       Arguments: new --debug:ephemeral-hive nunit --no-restore
[xUnit.net 00:00:44.62]       Exit Code: 103
[xUnit.net 00:00:44.62]       StdOut:
[xUnit.net 00:00:44.62]       
[xUnit.net 00:00:44.62]       StdErr:
[xUnit.net 00:00:44.62]       Unable to resolve the template, the following installed templates are conflicting:
[xUnit.net 00:00:44.62]       Identity                               Template Name         Short Name  Language  Precedence  Author                                            Package
[xUnit.net 00:00:44.62]       -------------------------------------  --------------------  ----------  --------  ----------  ------------------------------------------------  -------
[xUnit.net 00:00:44.62]       NUnit3.DotNetNew.Template.CSharp.10.0  NUnit 3 Test Project  nunit       C#        11000       Aleksei Kharlov aka halex2005 (codeofclimber.ru)         
[xUnit.net 00:00:44.62]       NUnit3.DotNetNew.Template.CSharp.9.0   NUnit 3 Test Project  nunit       C#        11000       Aleksei Kharlov aka halex2005 (codeofclimber.ru)         

Any idea where the NUnit3.DotNetNew.Template.CSharp.9.0 template is coming from?


EDIT: Ok the previous templates come from here:

<PackageReference Include="Microsoft.DotNet.Common.ProjectTemplates.9.0" VersionOverride="9.0.*-*" GeneratePathProperty="true" />

Still no idea why this works for the csharp classlib templates between 9.0 and 10.0 as they also have the same short name.

@mmitche
Copy link
Member

mmitche commented Dec 17, 2024

@ViktorHofer @marcpopMSFT The FullFramework leg has some test failures. Could you please take a look?

System.InvalidOperationException : Exception during discovery:
System.IO.FileLoadException: Could not load file or assembly 'Microsoft.DotNet.XUnitExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' or one of its dependencies. Strong name signature could not be verified. The assembly may have been tampered with, or it was delay signed but not fully signed with the correct private key. (Exception from HRESULT: 0x80131045)
File name: 'Microsoft.DotNet.XUnitExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
at System.ModuleHandle.ResolveMethod(RuntimeModule module, Int32 methodToken, IntPtr* typeInstArgs, Int32 typeInstCount, IntPtr* methodInstArgs, Int32 methodInstCount)
at System.ModuleHandle.ResolveMethodHandleInternalCore(RuntimeModule module, Int32 methodToken, IntPtr[] typeInstantiationContext, Int32 typeInstCount, IntPtr[] methodInstantiationContext, Int32 methodInstCount)
at System.ModuleHandle.ResolveMethodHandleInternal(RuntimeModule module, Int32 methodToken, RuntimeTypeHandle[] typeInstantiationContext, RuntimeTypeHandle[] methodInstantiationContext)
at System.Reflection.CustomAttributeData..ctor(RuntimeModule scope, CustomAttributeRecord caRecord)
at System.Reflection.CustomAttributeData.GetCustomAttributes(RuntimeModule module, Int32 tkTarget)
at System.Reflection.CustomAttributeData.GetCustomAttributesInternal(RuntimeMethodInfo target)
at Xunit.Sdk.ReflectionMethodInfo.GetCustomAttributes(MethodInfo method, Type attributeType, AttributeUsageAttribute attributeUsage) in //src/xunit.execution/Sdk/Reflection/ReflectionMethodInfo.cs:line 101
at Xunit.Sdk.ReflectionMethodInfo.GetCustomAttributes(String assemblyQualifiedAttributeTypeName) in //src/xunit.execution/Sdk/Reflection/ReflectionMethodInfo.cs:line 88
at Xunit.Sdk.XunitTestFrameworkDiscoverer.FindTestsForMethod(ITestMethod testMethod, Boolean includeSourceInformation, IMessageBus messageBus, ITestFrameworkDiscoveryOptions discoveryOptions) in //src/xunit.execution/Sdk/Frameworks/XunitTestFrameworkDiscoverer.cs:line 84
at Xunit.Sdk.XunitTestFrameworkDiscoverer.FindTestsForType(ITestClass testClass, Boolean includeSourceInformation, IMessageBus messageBus, ITestFrameworkDiscoveryOptions discoveryOptions) in //src/xunit.execution/Sdk/Frameworks/XunitTestFrameworkDiscoverer.cs:line 135

WRN: Assembly binding logging is turned OFF.
To enable assembly bind failure logging, set the registry value [HKLM\Software\Microsoft\Fusion!EnableLog] (DWORD) to 1.
Note: There is some performance penalty associated with assembly bind failure logging.
To turn this feature off, remove the registry value [HKLM\Software\Microsoft\Fusion!EnableLog].

I think this error is because the binary is delay signed (Arcade doesn't sign, and this is the Microsoft full framework public key). The question is why XUnit cares that it's strong name signed or not.

@marcpopMSFT
Copy link
Member

It's close, the arm64 failures look like the known timeouts so we just need the VMR legs to finish (and pass) and then can merge on red.

@v-wuzhai
Copy link
Member Author

@dotnet/source-build Could you take a look at the failures here?

@mthalman
Copy link
Member

@ViktorHofer - That roslyn patch didn't work because it sets a property based on those parameters that are being passed in and the type is now incompatible.

/__w/1/vmr/src/roslyn/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(94,67): error CS0029: Cannot implicitly convert type 'System.Collections.Immutable.ImmutableHashSet<Microsoft.CodeAnalysis.Project>' to 'System.Collections.Generic.IReadOnlySet<Microsoft.CodeAnalysis.Project>' [/__w/1/vmr/src/roslyn/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0]

Going back to the original issue, I don't understand why ImmutableHashSet isn't compatible with IReadOnlySet since it does implement that interface: https://github.com/dotnet/runtime/blob/d7e85d93c12aaa43937f8ef5f920c36b5afc756d/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableHashSet_1.cs#L19

@ViktorHofer
Copy link
Member

@mthalman maybe you were looking at a previous commit? The latest patch should work.

See dotnet/roslyn#76486 for the issue investigation.

@ViktorHofer ViktorHofer merged commit 77d763f into main Dec 18, 2024
34 of 37 checks passed
@ViktorHofer ViktorHofer deleted the dev/Jason/mergeToMain branch December 18, 2024 18:48
@dsplaisted
Copy link
Member

🎉🎉🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-CodeFlow untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.