Skip to content

Merge release/6.0-maui branch back into release/6.0 #64687

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

Merged
safern merged 34 commits into from
Feb 8, 2022
Merged

Merge release/6.0-maui branch back into release/6.0 #64687

Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
30c3091
Brand release/6.0-maui branch appropriately (#61792)
directhex Nov 24, 2021
af20fce
[mono][interp] Remove hack for nint/nfloat (#62053)
BrzVlad Nov 30, 2021
5e7fb16
Shrink version name due to nuget maximum (#62190)
directhex Dec 1, 2021
6c8d2b0
[release/6.0-maui] Exclude the managed code around libproc on iOS/tvO…
MaximLipnin Dec 2, 2021
3992fc3
Update timeout for sourcebuild (#61436) (#62300)
directhex Dec 2, 2021
2ab2de4
[MonoAOTCompiler] more properties & custom WorkingDirectory (#62849)
github-actions[bot] Dec 16, 2021
6523aa4
Merge branch 'release/6.0-maui' into merge/release/6.0-to-release/6.0…
akoeplinger Dec 20, 2021
d63fcb9
Disable package generation
akoeplinger Dec 20, 2021
37e3ee4
Merge pull request #62850 from dotnet-maestro-bot/merge/release/6.0-t…
jkotas Dec 22, 2021
7636d44
transform sgen_get_descriptor to parallel safe version in job_major_m…
github-actions[bot] Jan 4, 2022
b96f560
Bump SdkBandVersion prop to 6.0.200 (#62787)
steveisok Jan 4, 2022
a66e67b
Bump SdkVersionForWorkloadTesting to use a 200 band SDK (#63450)
steveisok Jan 7, 2022
a9d5ccd
[release/6.0-maui] Add back HAVE_SYS_ZLIB support (#63359)
lambdageek Jan 10, 2022
f36afb1
[release/6.0-maui] Backport MacCatalyst process start support (#62520)
simonrozsival Jan 11, 2022
936a1c1
[automated] Merge branch 'release/6.0' => 'release/6.0-maui' (#63112)
dotnet-maestro-bot Jan 14, 2022
e08fc29
Merge branch 'release/6.0-maui' into merge/release/6.0-to-release/6.0…
akoeplinger Jan 17, 2022
1ea69f9
Merge pull request #63807 from dotnet-maestro-bot/merge/release/6.0-t…
akoeplinger Jan 17, 2022
a54012e
[release/6.0-maui] Serialize SendPacketsAsync tests (#63896)
github-actions[bot] Jan 18, 2022
ffa6594
[release/6.0-maui] [Android] Prevent potential out of bounds write on…
github-actions[bot] Jan 18, 2022
994a341
[release/6.0-maui] [debugger] Fix reading a byte without checking the…
thaystg Jan 18, 2022
063054b
[release/6.0-maui] [mono][debugger] Fix step on ios when using interp…
github-actions[bot] Jan 18, 2022
fd2cdbb
[iOS/tvOS] Remove P/Invokes to libproc from System.Private.CoreLib (#…
akoeplinger Jan 18, 2022
49d6db3
[release/6.0-maui] [Android] Fix accessing network interfaces informa…
simonrozsival Jan 18, 2022
4f567e5
Take MacCatalyst into account in EnvironmentTests.WorkingSet_Valid te…
github-actions[bot] Jan 19, 2022
6371525
[release/6.0-maui] Android remove backward timezones (#64228)
github-actions[bot] Jan 24, 2022
059caa2
Merge pull request #64056 from dotnet-maestro-bot/merge/release/6.0-t…
akoeplinger Jan 25, 2022
9e82981
[release/6.0-maui][mono] Recognize new names for Xamarin.iOS etc asse…
akoeplinger Jan 26, 2022
2405c8e
Revert branch specific changes
safern Jan 26, 2022
e7920eb
Merge branch 'release/6.0' into merge-maui-branch-to-6.0
akoeplinger Feb 3, 2022
7ba7eae
Merge remote-tracking branch 'upstream/release/6.0' into merge-maui-b…
akoeplinger Feb 7, 2022
0f45149
Add the ability to generate Mono toolchain manifests per sdk band. 1…
Feb 8, 2022
bdc58e1
Merge remote-tracking branch 'upstream/release/6.0' into merge-maui-b…
Feb 8, 2022
da2f120
Remove unnecessary SdkBandVersion prop
Feb 8, 2022
0dead8c
Revert removing SdkBandVersion change. Wasm tests still need it
Feb 8, 2022
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
Prev Previous commit
Revert removing SdkBandVersion change. Wasm tests still need it
  • Loading branch information
Steve Pfister committed Feb 8, 2022
commit 0dead8cd4b4e948c32b9928b753e8fa0060a65ba
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<MajorVersion>6</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>3</PatchVersion>
<SdkBandVersion>6.0.200</SdkBandVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration>
</PreReleaseVersionIteration>
Expand Down