Skip to content
This repository was archived by the owner on May 15, 2024. It is now read-only.

.gitattributes: get better diff context for C# code #1115

Merged
merged 1 commit into from
Feb 23, 2020

Conversation

janusw
Copy link
Contributor

@janusw janusw commented Feb 23, 2020

Description of Change

This PR simply uncomments one line in the gitattributes file, giving me better diff context in hunk headers.

Background: When looking at commit diffs (at the command line or via tools like gitk), one currently gets rather bad context indicators in the hunk headers for C# code (usually the enclosing namespace). With this change, the situation improves a lot, and one gets the correct context (class or function name). Not sure why this is commented out in the first place.

@Redth Redth merged commit 31f81d8 into xamarin:develop Feb 23, 2020
@janusw janusw deleted the gitattributes_diff_csharp branch February 23, 2020 20:11
Redth added a commit that referenced this pull request Feb 26, 2020
* Implement vertical accuracy in GeoLocation API (#1103)

* Location: add property 'VerticalAccuracy' (#1099)

* vertical accuracy is only available in Android API level 26 and above (#1099)

* update Samples app to show vertical accuracy on GeolocationPage

* add missing documentation bits for Location.VerticalAccuracy

* .gitattributes: get better diff context for C# code (#1115)

* Location.VerticalAccuracy: add runtime check for Android version (#1099) (#1116)

* the compile-time check is not enough
* it crashed on old Android versions (<8.0)

* GH-1102 Fix launcher on older devices (#1120)

* Update Launcher.ios.tvos.cs

* OpenUrlAsync was introduced in iOS 10 not 12

https://docs.microsoft.com/en-us/dotnet/api/uikit.uiapplication.openurlasync?view=xamarin-ios-sdk-12

* Fix trailing whitespace

* Really? fix whitespace

* Really! Fix whitespace

Co-authored-by: Janus Weil <janus@gcc.gnu.org>
Co-authored-by: James Montemagno <james.montemagno@gmail.com>
Redth added a commit that referenced this pull request Feb 27, 2020
* WebAuthenticator API (#1062)

* Initial work for WebAuthenticator API

* Fix page loaded in sample

* Fix weird generated item

* Fix error message

* Fix filename, too many .'s

* Remove unnecessary comment

* Tweak AppleSignIn API

* Cancel any previous waiting tasks

* Use WebAuthenticationBroker on UWP

* Make code more readable

* iOS10+ is only supported so remove check

* Move last fallback into TVOS

* Remove unnecessary duplicate attribute

* Change exception type.

* Better error message

* Make AppleSignIn accessible from shared code

* Added sample aspnet project for auth

* Apple Signin for iOS only for now

* Make auth sample use sample server

* Added some tests

* Make some methods private that shouldn't be public

* Add docs

* Increase device test timeout

* Add human interaction traits to some new tests

* Update devicetests cake

Updated to newer addins
Stop using cake bootstrappers

* Run device tests with cake dotnet core

* Bump xunit device runner

* Tests go back to netcore 2

* Bump xunit device runner in rest of devicetest projs

* Build that android app first!

* Cleanup web auth

- Change result type name
- Clean up result type properties
- Remove IsSupported from apple public api
- Throw not supported in public apple api on < iOS 13

* Update sample to check for iOS 13 independently

* Update docs

* Make code a bit more readable.

* More readable code changes

* Fix test

* Add some detection of callback activity

This adds some code to ensure the developer has subclassed `WebAuthenticatorCallbackActivity` and registered an appropriate intentfilter for it based on the `callbackUrl` being used.

Co-authored-by: James Montemagno <james.montemagno@gmail.com>

* Use iOS 13.3 :) (#1089)

* Rename apple signin options (#1094)

* Rename type

* Fix docs

* Android setup Script (#1086)

* Add Android setup script

Installs everything you need for development :)

* Update README.md

* Update README.md

* This double is not in the interning list of double, so this will allocate less. Verified in Benchmark.Net (#1097)

* Try catch getting Network Adapter and only query it once. Log if there is an issue. (#1088)

Co-authored-by: Jonathan Dick <jondick@gmail.com>

* Cache device type and name (#1087)

Co-authored-by: Jonathan Dick <jondick@gmail.com>

* AndroidX (#1095)

* Use AndroidX references for Android 10+

* Directly use AndroidX api's on API 29 +

* Bump sample/device tests to api 29

* Migrate resource files in device tests / sample to androidx

* Fix nuget references

* Fix test with api 29 deprecations

* Go STABLE!!!

* Drop Android 6.0-7.1 as targets

This is just the compile targets, it still runs all the way to 4.4 - and probably earlier

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

* four more minor changes (#1101)

* This double is not in the interning list of double, so this will allocate less. Verified in Benchmark.Net

* Should both be readonly

* I reused the branch so I need to remove this for merging

* type should be static, features should be unique. more efficient

Co-authored-by: Jonathan Dick <jondick@gmail.com>

* Launch adjacent flag on Android 24+ (#1074)

* Launch adjacent! <3 Dou It!

* refactor code

* not share

* 1.5.0 Changes (#1124)

* Implement vertical accuracy in GeoLocation API (#1103)

* Location: add property 'VerticalAccuracy' (#1099)

* vertical accuracy is only available in Android API level 26 and above (#1099)

* update Samples app to show vertical accuracy on GeolocationPage

* add missing documentation bits for Location.VerticalAccuracy

* .gitattributes: get better diff context for C# code (#1115)

* Location.VerticalAccuracy: add runtime check for Android version (#1099) (#1116)

* the compile-time check is not enough
* it crashed on old Android versions (<8.0)

* GH-1102 Fix launcher on older devices (#1120)

* Update Launcher.ios.tvos.cs

* OpenUrlAsync was introduced in iOS 10 not 12

https://docs.microsoft.com/en-us/dotnet/api/uikit.uiapplication.openurlasync?view=xamarin-ios-sdk-12

* Fix trailing whitespace

* Really? fix whitespace

* Really! Fix whitespace

Co-authored-by: Janus Weil <janus@gcc.gnu.org>
Co-authored-by: James Montemagno <james.montemagno@gmail.com>

Co-authored-by: James Montemagno <james.montemagno@gmail.com>
Co-authored-by: Niklas Schilli <schillinik@yahoo.de>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Janus Weil <janus@gcc.gnu.org>
Redth added a commit that referenced this pull request Mar 3, 2020
* Implement vertical accuracy in GeoLocation API (#1103)

* Location: add property 'VerticalAccuracy' (#1099)

* vertical accuracy is only available in Android API level 26 and above (#1099)

* update Samples app to show vertical accuracy on GeolocationPage

* add missing documentation bits for Location.VerticalAccuracy

* .gitattributes: get better diff context for C# code (#1115)

* Location.VerticalAccuracy: add runtime check for Android version (#1099) (#1116)

* the compile-time check is not enough
* it crashed on old Android versions (<8.0)

* GH-1102 Fix launcher on older devices (#1120)

* Update Launcher.ios.tvos.cs

* OpenUrlAsync was introduced in iOS 10 not 12

https://docs.microsoft.com/en-us/dotnet/api/uikit.uiapplication.openurlasync?view=xamarin-ios-sdk-12

* Fix trailing whitespace

* Really? fix whitespace

* Really! Fix whitespace

* Fixes #1129 - set empty required declarations on UWP (#1133)

* Fixes #1129 - set empty required declarations on UWP

* Update Permissions.uwp.cs

* Update Xamarin.Essentials.csproj (#1136)

* GH-1142 AccessBackgroundLocation only when compile & running Q (#1143)

* AccessBackgroundLocation only when compile & running Q

* put if compile check around permission

* GH-1121 If VC is null use TraitCollection (#1144)

* Fixes #1123 (#1126)

* Update PlacemarkExtensions.xml (#1132)

Co-authored-by: Janus Weil <janus@gcc.gnu.org>
Co-authored-by: James Montemagno <james.montemagno@gmail.com>
Co-authored-by: Michael <Michael@ZPF.fr>
jamesmontemagno added a commit that referenced this pull request Mar 6, 2020
* Implement vertical accuracy in GeoLocation API (#1103)

* Location: add property 'VerticalAccuracy' (#1099)

* vertical accuracy is only available in Android API level 26 and above (#1099)

* update Samples app to show vertical accuracy on GeolocationPage

* add missing documentation bits for Location.VerticalAccuracy

* .gitattributes: get better diff context for C# code (#1115)

* Location.VerticalAccuracy: add runtime check for Android version (#1099) (#1116)

* the compile-time check is not enough
* it crashed on old Android versions (<8.0)

* GH-1102 Fix launcher on older devices (#1120)

* Update Launcher.ios.tvos.cs

* OpenUrlAsync was introduced in iOS 10 not 12

https://docs.microsoft.com/en-us/dotnet/api/uikit.uiapplication.openurlasync?view=xamarin-ios-sdk-12

* Fix trailing whitespace

* Really? fix whitespace

* Really! Fix whitespace

* Fixes #1129 - set empty required declarations on UWP (#1133)

* Fixes #1129 - set empty required declarations on UWP

* Update Permissions.uwp.cs

* Update Xamarin.Essentials.csproj (#1136)

* GH-1142 AccessBackgroundLocation only when compile & running Q (#1143)

* AccessBackgroundLocation only when compile & running Q

* put if compile check around permission

* GH-1121 If VC is null use TraitCollection (#1144)

* Fixes #1123 (#1126)

* Update PlacemarkExtensions.xml (#1132)

Co-authored-by: Janus Weil <janus@gcc.gnu.org>
Co-authored-by: James Montemagno <james.montemagno@gmail.com>
Co-authored-by: Michael <Michael@ZPF.fr>

Co-authored-by: Jonathan Dick <jodick@microsoft.com>
Co-authored-by: Janus Weil <janus@gcc.gnu.org>
Co-authored-by: Michael <Michael@ZPF.fr>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants