-
Notifications
You must be signed in to change notification settings - Fork 538
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
[main] Update dependencies from dotnet/sdk #9395
Merged
jonpryor
merged 63 commits into
main
from
darc-main-714b3296-586d-442c-9958-cb73c20d69cb
Jan 10, 2025
Merged
Changes from all commits
Commits
Show all changes
63 commits
Select commit
Hold shift + click to select a range
1890caa
Update dependencies from https://github.com/dotnet/sdk build 20241010.13
dotnet-maestro[bot] 28b45d4
Failed to perform coherency update for one or more dependencies.
dotnet-maestro[bot] 55f32de
Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport
jonathanpeppers 9b0be6d
darc update-dependencies --coherency-only
jonathanpeppers ce4e82c
Update Versions.props
jonathanpeppers aa8af85
dotnet10 feed
jonathanpeppers 59111e4
Update dependencies from https://github.com/dotnet/sdk build 20241024.9
dotnet-maestro[bot] 2692aff
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers 9a449d8
darc update-dependencies --id 243767
jonathanpeppers fe288c0
Took a pass, moving .NET 9 -> .NET 10
jonathanpeppers f78614c
Temporarily remove net9 manifests
jonathanpeppers b27003d
[build] install .NET on Linux
jonathanpeppers 5a445d8
Rename file to net10.0
jonathanpeppers bf6c921
Temporarily remove microsoft-net-runtime-android-net9
jonathanpeppers 219fc89
Update dependencies from https://github.com/dotnet/sdk build 20241103.6
dotnet-maestro[bot] 08c02bc
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers 64fd781
Update AutoImport.props
jonathanpeppers 8fa7de3
Update dependencies from https://github.com/dotnet/sdk build 20241110.6
dotnet-maestro[bot] cabc9ae
Update dependencies from https://github.com/dotnet/sdk build 20241118.3
dotnet-maestro[bot] b639227
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers 0c94dae
Include all `darc-pub-` feeds
jonathanpeppers 9dcde99
Fix `BindPackLibrary()` test
jonathanpeppers b85c83c
.NET 9 is GA now
jonathanpeppers ac07c16
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers 9378298
Update dependencies from https://github.com/dotnet/sdk build 20241123.1
dotnet-maestro[bot] 8843e9a
Update dependencies from https://github.com/dotnet/sdk build 20241205.38
dotnet-maestro[bot] 13a2cfc
Revert "Rename file to net10.0"
jonathanpeppers b722fab
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers 7464778
Reapply "Rename file to net10.0"
jonathanpeppers 6e4b66f
Update dependencies from https://github.com/dotnet/sdk build 20241209.2
dotnet-maestro[bot] 5beb1e9
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers 1d49919
Update dependencies from https://github.com/dotnet/sdk build 20241209.4
dotnet-maestro[bot] 79c704d
Update dependencies from https://github.com/dotnet/sdk build 20241212.16
dotnet-maestro[bot] 02d0ea1
Update dependencies from https://github.com/dotnet/sdk build 20241216.1
dotnet-maestro[bot] 50242b9
Update dependencies from https://github.com/dotnet/sdk build 20241220.1
dotnet-maestro[bot] 61325c0
Update dependencies from https://github.com/dotnet/sdk build 20241220.2
dotnet-maestro[bot] fc99420
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers cc11abd
Revert "Temporarily remove net9 manifests"
jonathanpeppers 6ced2a3
Revert "Temporarily remove microsoft-net-runtime-android-net9"
jonathanpeppers 2d55ef2
Android 35.0.24 shipped
jonathanpeppers 0d52223
Update workload-dependencies.csproj
jonathanpeppers 1da8c97
[main] Update dependencies from dotnet/sdk (#9644)
dotnet-maestro[bot] 5bbab28
darc update-dependencies --coherency-only
jonathanpeppers 8e2b335
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers 7e1be48
Replace `@DOTNET_TARGET_FRAMEWORK_VERSION@`
jonathanpeppers d01b2a7
`darc update-dependencies --id 251080`
jonathanpeppers d11a0ef
`darc update-dependencies --id 251060`
jonathanpeppers fa0d03d
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers 2960637
Fix tests
jonathanpeppers 4333dfe
Fix MissingProjectReference
jonathanpeppers 12e0100
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers 3d339c3
Remove `( )` from `CheckSignApk()` test folder
jonathanpeppers 3c94439
Update PackagingTest.cs
jonathanpeppers bcc05e0
BuildApplicationWithSpacesInPath
jonathanpeppers 404c87b
CheckOldResourceDesignerWithWrongCasingIsRemoved
jonathanpeppers df3657c
BuildProguardEnabledProject
jonathanpeppers a927be0
BuildApplicationWithLibraryAndClean
jonathanpeppers 0f026a9
CheckOldResourceDesignerIsNotUsed
jonathanpeppers c3b28f6
CheckSignApk
jonathanpeppers c103d57
DotNetInstallAndRunPreviousSdk
jonathanpeppers 1e61fc6
SupportedOSPlatformVersion
jonathanpeppers 056595a
`release.keystore` in different directory
jonathanpeppers 028e12b
Merge branch 'main' into darc-main-714b3296-586d-442c-9958-cb73c20d69cb
jonathanpeppers File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/Microsoft.Android.Templates/android-wear/AndroidApp1.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 6 additions & 6 deletions
12
src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,22 @@ | ||
<Project> | ||
<ImportGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' "> | ||
<Import Project="Sdk.targets" Sdk="Microsoft.Android.Sdk.net10" | ||
Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '10.0')) " /> | ||
<Import Project="Sdk.targets" Sdk="Microsoft.Android.Sdk.net9" | ||
Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) " /> | ||
<Import Project="Sdk.targets" Sdk="Microsoft.Android.Sdk.net8" | ||
Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '8.0')) " /> | ||
<Import Project="Eol.targets" Sdk="Microsoft.Android.Sdk.net9" | ||
Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) or $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) " /> | ||
<Import Project="Eol.targets" Sdk="Microsoft.Android.Sdk.net10" | ||
Condition=" $([MSBuild]::VersionLessThanOrEquals($(TargetFrameworkVersion), '8.0')) " /> | ||
</ImportGroup> | ||
|
||
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '8.0')) "> | ||
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) "> | ||
<KnownFrameworkReference | ||
Update="Microsoft.Android" | ||
LatestRuntimeFrameworkVersion="@NET_PREVIOUS_VERSION@" | ||
TargetingPackVersion="@NET_PREVIOUS_VERSION@" | ||
/> | ||
</ItemGroup> | ||
|
||
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '8.0')) "> | ||
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '9.0')) "> | ||
<SdkSupportedTargetPlatformIdentifier Include="android" DisplayName="Android" /> | ||
</ItemGroup> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
At some point we should auto generate these files so that we don't have to keep updating them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did this for
AutoImport.props
, but yeah each year we should do a couple. This year had a lot of blockers, though...