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.

Sign up for GitHub

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

Jump to bottom

[net9.0] Merge main into net9.0. #20639

Merged
merged 11 commits into from
May 24, 2024
Merged

[net9.0] Merge main into net9.0. #20639

merged 11 commits into from
May 24, 2024

Conversation

rolfbjarne
Copy link
Member

No description provided.

dotnet-maestro bot and others added 11 commits May 21, 2024 19:56
@dotnet-maestro
[main] Update dependencies from dotnet/installer (dotnet#20551)
37591c7 
This pull request updates the following dependencies

## From https://github.com/dotnet/installer

- **Subscription**: 80cb9ffd-f92f-4fc8-9f8b-08dbca46abfb
- **Build**: 20240520.16
- **Date Produced**: May 20, 2024 10:56:15 PM UTC
- **Commit**: fdba15e12c3d5592c7362fbb6db83cbd906f9130
- **Branch**: refs/heads/release/8.0.1xx

- **Updates**:
  - **Microsoft.Dotnet.Sdk.Internal**: [from 8.0.105-servicing.24216.7 to 8.0.107-servicing.24270.16][37]
  - **Microsoft.NET.ILLink.Tasks**: [from 8.0.4 to 8.0.5][38]
  - **Microsoft.AspNetCore.App.Ref**: [from 8.0.4 to 8.0.5][39]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.4 to 8.0.5][38]
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.4 to 8.0.5][40]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.4 to 8.0.5][38]

[37]: dotnet/installer@7979780...fdba15e
[38]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC2d7eea252964e69be94cb9c847b371b23e4dd470&targetVersion=GC087e15321bb712ef6fe8b0ba6f8bd12facf92629&_a=files
[39]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC8486d31e24f30e3fa1809a95699a0adc16f448d7&targetVersion=GCc9e3996173cec136bc2e9f3b4ec45f2a323b1d63&_a=files
[40]: dotnet/emsdk@08a90ca...71359b1

## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

- **Coherency Updates**:
  - **Microsoft.NET.ILLink.Tasks**: from 8.0.4 to 8.0.5 (parent: Microsoft.Dotnet.Sdk.Internal)
  - **Microsoft.AspNetCore.App.Ref**: from 8.0.4 to 8.0.5 (parent: Microsoft.Dotnet.Sdk.Internal)
  - **Microsoft.NETCore.App.Ref**: from 8.0.4 to 8.0.5 (parent: Microsoft.Dotnet.Sdk.Internal)
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.4 to 8.0.5 (parent: Microsoft.NETCore.App.Ref)
  - **Microsoft.NETCore.App.Ref**: from 8.0.4 to 8.0.5 (parent: Microsoft.Dotnet.Sdk.Internal)
@rolfbjarne
[devops] Clean up temporary files to fix api diff. (dotnet#20619)
56e2e47 
API diff currently fails with:

	** Error: Working directory isn't clean:
	HEAD detached at origin/pull/20587/head
	Untracked files:
	(use "git add <file>..." to include in what will be committed)
	tmp.txt

So clean up after ourselves in a previous step to avoid this.
@MSylvia
Update OneLocBuildToken (dotnet#20627)
b05cac8 
Update the token in the Localization step to one backed by a managed identity

---------

Co-authored-by: Matt Sylvia <[email protected]>
@dotnet-maestro
[main] Update dependencies from dotnet/xharness (dotnet#20599)
e52af40 
This pull request updates the following dependencies

## From https://github.com/dotnet/xharness

- **Subscription**: 601bc5e1-1cae-44b5-cf5f-08db9342aa2f
- **Build**: 20240506.1
- **Date Produced**: May 6, 2024 1:53:56 PM UTC
- **Commit**: 62a8662088425e03f7ba44a4ec817c198e38d0f9
- **Branch**: refs/heads/main

- **Updates**:
  - **Microsoft.DotNet.XHarness.iOS.Shared**: [from 9.0.0-prerelease.24252.1 to 9.0.0-prerelease.24256.1][1]

[1]: dotnet/xharness@53a781a...62a8662
@dotnet-maestro
[main] Update dependencies from dotnet/installer (dotnet#20630)
e549986 
This pull request updates the following dependencies

## From https://github.com/dotnet/installer

- **Subscription**: 80cb9ffd-f92f-4fc8-9f8b-08dbca46abfb
- **Build**: 20240521.26
- **Date Produced**: May 22, 2024 12:58:20 AM UTC
- **Commit**: 127cf75b9cc63c95ede49d93daea49507b79d972
- **Branch**: refs/heads/release/8.0.1xx

- **Updates**:
  - **Microsoft.Dotnet.Sdk.Internal**: [from 8.0.107-servicing.24270.16 to 8.0.107-servicing.24271.26][1]

[1]: dotnet/installer@fdba15e...127cf75
@rolfbjarne
[Security] Make remaining P/Invokes have blittable signatures. (dotne…
6f61fac 
…t#20618)

Contributes towards dotnet#15684.
@rolfbjarne
[AudioUnit] Make P/Invokes in AudioUnit.cs have blittable signatures. (…
a9b2314 
…dotnet#20620)

Contributes towards dotnet#15684.
@rolfbjarne
[devops] Look in the correct directory for the API diff results. (dot…
26e6bb8 
…net#20624)

Fixes this failure:

> 🔥 Unable to find the contents for the comment: D:\a\1\a\change-detection\results\gh-comment.md does not exist :fire

This is a partial revert of dotnet#20601, which broke the API diff.
@rolfbjarne
[cecil-tests] Fix assertion message to use the doc id instead of the …
0f91fcd 
…typename of a tuple. (dotnet#20632)

So instead of this:

> Cecil.Tests.Documentation+AssemblyApi: Documented API not found in the platform assembly. This probably indicates that the code to compute the doc name for a given member is incorrect.

we'll get:

> T:Foundation.SomeType: Documented API not found in the platform assembly. This probably indicates that the code to compute the doc name for a given member is incorrect.
@rolfbjarne
[Blocks] Remove a block callback validation that's apparently too eag…
76cef6c 
…er. (dotnet#20625)

The validation verifies that the function pointer for a block callback is the
same the return value from the method's
MethodInfo.MethodHandle.GetFunctionPointer() method.

In actual code, it's equivalent to validating that the following always prints "Equal: true":

```cs
[UnmanagedCallersOnly]
public static void Invoke () {}

static void Test ()
{
    delegate* unmanaged<void> fptr1 = &Invoke;
    IntPtr fptr2 = GetType ().GetMethod ("Invoke").MethodHandle.GetFunctionPointer ();
    Console.WriteLine ($"fptr1: 0x{((IntPtr) fptr1).ToString ("x")}");
    Console.WriteLine ($"fptr2: 0x{fptr2.ToString ("x")}");
    Console.WriteLine ($"Equal: ((IntPtr) fptr1) == fptr2}"); // prints "Equal: true" for me
}
```

However, this isn't documented, and some feedback indicates it's certainly not
a valid assumption for CoreCLR:

https://discord.com/channels/732297728826277939/732582981163548703/1242473425759633488

And there's also a customer running into this validation, apparently without cause:
https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2054534

So just remove it.
@rolfbjarne
[net9.0] Merge main into net9.0.
1127798
@rolfbjarne rolfbjarne requested a review from dalexsoto as a code owner May 23, 2024 09:34
@vs-mobiletools-engineering-service2
Copy link
Collaborator

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ API diff for current PR / commit

Legacy Xamarin (No breaking changes)
  • iOS (no change detected)
  • tvOS (no change detected)
  • watchOS (no change detected)
  • macOS (no change detected)
NET (empty diffs)
  • iOS: (empty diff detected)
  • tvOS: (empty diff detected)
  • MacCatalyst: (empty diff detected)
  • macOS: (empty diff detected)

✅ API diff vs stable

Legacy Xamarin (No breaking changes)
.NET (No breaking changes)
Legacy Xamarin (stable) vs .NET

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 11277981855e93a43121bb1338f8c16ebe6f7b3f [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2
Copy link
Collaborator

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 172 tests passed 🎉

Tests counts

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (iOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (MacCatalyst): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (macOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (Multiple platforms): All 1 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ dotnettests (tvOS): All 1 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ framework: All 8 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ install-source: All 1 tests passed. Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 7 tests passed. Html Report (VSDrops) Download
✅ introspection: All 8 tests passed. Html Report (VSDrops) Download
✅ linker: All 65 tests passed. Html Report (VSDrops) Download
✅ mac-binding-project: All 1 tests passed. Html Report (VSDrops) Download
✅ mmp: All 2 tests passed. Html Report (VSDrops) Download
✅ mononative: All 6 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 8 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 9 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (watchOS): All 4 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ mtouch: All 1 tests passed. Html Report (VSDrops) Download
✅ xammac: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 8 tests passed. Html Report (VSDrops) Download
✅ xtro: All 2 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [PR Build] Tests on macOS X64 - Mac Sonoma (14) failed ❌

Failed tests are:

  • introspection
  • xammac_tests
  • monotouch-test

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [PR Build] Tests on macOS M1 - Mac Ventura (13) passed 💻

✅ All tests on macOS M1 - Mac Ventura (13) passed.

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [PR Build] Tests on macOS M1 - Mac Monterey (12) passed 💻

✅ All tests on macOS M1 - Mac Monterey (12) passed.

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [CI Build] Windows Integration Tests failed ❌

❌ Failed ❌

Pipeline on Agent
Hash: 11277981855e93a43121bb1338f8c16ebe6f7b3f [PR build]

1 similar comment
@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [CI Build] Windows Integration Tests failed ❌

❌ Failed ❌

Pipeline on Agent
Hash: 11277981855e93a43121bb1338f8c16ebe6f7b3f [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [PR Build] Tests on macOS X64 - Mac Sonoma (14) failed ❌

Failed tests are:

  • introspection
  • xammac_tests
  • monotouch-test

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [PR Build] Tests on macOS X64 - Mac Sonoma (14) failed ❌

Failed tests are:

  • introspection
  • xammac_tests
  • monotouch-test

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [CI Build] Windows Integration Tests failed ❌

❌ Failed ❌

Pipeline on Agent
Hash: 11277981855e93a43121bb1338f8c16ebe6f7b3f [PR build]

@rolfbjarne
Copy link
Member Author

Test failures are unrelated (#20117, #20641, #20640).

@rolfbjarne rolfbjarne merged commit c642f20 into dotnet:net9.0 May 24, 2024
60 of 63 checks passed
@rolfbjarne rolfbjarne deleted the bump-main-in-net9.0-2024-05-23 branch May 24, 2024 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dalexsoto dalexsoto dalexsoto approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rolfbjarne @vs-mobiletools-engineering-service2 @dalexsoto @MSylvia