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

[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' #44022

Merged
merged 53 commits into from
Oct 10, 2024
Merged

[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' #44022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
2486923
Merge commit '88132ec04fe8cf33d3b34f1daa22c2aa4ec7c8ab'
Aug 6, 2024
c63f681
Merge commit '645be96e62e89fe8e19c7e0197aed7af7ba12fec'
Aug 11, 2024
a448499
Merge commit '7a4ccebb778b59bfd4aa40f457d0b99f951fa481'
Aug 13, 2024
992c265
Merge commit '839e656dcc6bc97ae1b82013d0c9ad586a544ab0'
Aug 14, 2024
f9ad8bf
Merged PR 41536: [internal/release/6.0.1xx] Update dependencies from …
Aug 15, 2024
545b7dd
Merged PR 41772: [internal/release/6.0.1xx] Update dependencies from …
Aug 16, 2024
a9e1ba5
Merged PR 41778: [internal/release/6.0.1xx] Update dependencies from …
Aug 16, 2024
902e4fa
Merged PR 41815: [internal/release/6.0.1xx] Update dependencies from …
Aug 17, 2024
436bce4
Merged PR 41826: [internal/release/6.0.1xx] Update dependencies from …
Aug 17, 2024
be7da2b
Merged PR 41864: [internal/release/6.0.1xx] Update dependencies from …
Aug 19, 2024
828b03c
Merge commit '4d9c8d2735f7dd83ead2da7c4f7541f2c5f7d3fd'
Aug 29, 2024
6b5e21e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 3, 2024
65957f3
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 5, 2024
cf01aac
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 6, 2024
c1de528
Updated .vsts-ci.yml
marcpopMSFT Sep 9, 2024
1a7cab0
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 9, 2024
2993393
Modify first run tests to all use a different test folder so there's …
marcpopMSFT Sep 9, 2024
371e8dc
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 10, 2024
0a899bb
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 10, 2024
6e8de6c
Merged PR 42559: Merge GH release/6.0.1xx to internal/release/6.0.1xx
marcpopMSFT Sep 10, 2024
13c140c
Swap the order of the commands in case that's affecting the first run…
marcpopMSFT Sep 10, 2024
a238702
Revert "Modify first run tests to all use a different test folder so …
marcpopMSFT Sep 10, 2024
d8add06
Revert "Swap the order of the commands in case that's affecting the f…
marcpopMSFT Sep 10, 2024
0eb1a35
Skip two of the first run tests that aren't correctly resetting the e…
marcpopMSFT Sep 10, 2024
f12afa0
Fix typo
marcpopMSFT Sep 11, 2024
18e4ae8
Null out the helix access token in the test
marcpopMSFT Sep 11, 2024
8cd5234
try the osx13 queues to see if they work better.
marcpopMSFT Sep 11, 2024
715cbd3
Merged PR 42391: [internal/release/6.0.1xx] Update dependencies from …
Sep 11, 2024
542fac1
Add OSX13 to the test infrastructure
marcpopMSFT Sep 11, 2024
c3eac00
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 11, 2024
1d51dbf
remove system access token as well
marcpopMSFT Sep 12, 2024
dc8224e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
9c00f7a
Merged PR 42752: [internal/release/6.0.1xx] Update dependencies from …
Sep 12, 2024
95dcc8e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
b534695
Merged PR 42781: [internal/release/6.0.1xx] Update dependencies from …
Sep 12, 2024
d0f14db
Revert to OSx 12 now that three bad machines are out of rotation
marcpopMSFT Sep 12, 2024
daa0f16
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
fdf329d
Merged PR 42794: [internal/release/6.0.1xx] Update dependencies from …
Sep 13, 2024
1cc7dea
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2024
e96b946
Merged PR 42792: Fix full framework and disable some tests
marcpopMSFT Sep 13, 2024
040861c
Merged PR 42838: [internal/release/6.0.1xx] Update dependencies from …
Sep 13, 2024
0bc8245
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 16, 2024
01eda4d
Merged PR 42872: [internal/release/6.0.1xx] Update dependencies from …
Sep 16, 2024
954f381
Merged PR 42877: [internal/release/6.0.1xx] Merge from public
vseanreesermsft Sep 16, 2024
f6397af
Update branding to 6.0.136
vseanreesermsft Oct 1, 2024
b2bf826
add osx14 rid
marcpopMSFT Oct 2, 2024
57d1594
Switch back to macos 13
marcpopMSFT Oct 3, 2024
53b1896
Switch back to macos 13
marcpopMSFT Oct 3, 2024
da41cc8
remove osx14 from the ridlist in the test
marcpopMSFT Oct 3, 2024
9a6ee33
Update branding to 6.0.136 (#43820)
marcpopMSFT Oct 4, 2024
1080b5b
Merge commit '954f381d16c2d44b573890786ca2d071c217a433' into internal…
vseanreesermsft Oct 8, 2024
3acbe04
Merging internal commits for release/6.0.1xx (#43980)
mmitche Oct 9, 2024
6a9dff5
Merge branch 'release/6.0.4xx' into merge/release/6.0.1xx-to-release/…
marcpopMSFT Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/NativeCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public static string InvokeNativeCodeAndReturnAString()
case "'osx.10.15-x64'":
case "'osx.11.0-x64'":
case "'osx.12-x64'":
case "'osx.13-x64'":
return Marshal.PtrToStringAnsi(MacNativeMethods.sqlite3_libversion());
case "'win10-x64'":
case "'win10-x86'":
Expand Down
1 change: 1 addition & 0 deletions src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/NativeCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public static string InvokeNativeCodeAndReturnAString()
case "'osx.10.15-x64'":
case "'osx.11.0-x64'":
case "'osx.12-x64'":
case "'osx.13-x64'":
return Marshal.PtrToStringAnsi(MacNativeMethods.sqlite3_libversion());
case "'win10-x64'":
case "'win10-x86'":
Expand Down
Loading