forked from dotnet/android
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[One .NET] support latest C #10 language features
Fixes: dotnet#6075 Fixes: dotnet#6076 Context: dotnet/macios#12173 We need to make two sets of changes for C# 10: 1. Support "global usings". Our .NET 6 templates should have no `using` statements at the top of `.cs` files. 2. Use `$(Nullable)` `enable` by default in project templates. To test this, our .NET 6 MSBuild tests use `Nullable=enable` by default and do no include `using` statements. I've made a new `MainActivity.cs` for our .NET 6 MSBuild tests. The "legacy" Xamarin.Android tests will use the original file.
- Loading branch information
1 parent
96eb449
commit e628acd
Showing
14 changed files
with
60 additions
and
83 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| using System; | ||
|
|
||
| namespace AndroidLib1 | ||
| { | ||
| public class Class1 | ||
|
|
||
22 changes: 22 additions & 0 deletions
22
...asks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ImplicitNamespaceImports.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 |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <!-- | ||
| *********************************************************************************************** | ||
| Microsoft.Android.Sdk.ImplicitNamespaceImports.targets | ||
| This file contains @(Import) items for C# 10 global usings. | ||
| *********************************************************************************************** | ||
| --> | ||
| <Project> | ||
| <!-- | ||
| There's a master switch, $(DisableImplicitNamespaceImports), | ||
| which, if set, will prevent all implicit namespace imports. | ||
| This is done automatically, we don't have to check | ||
| $(DisableImplicitNamespaceImports) here. | ||
| --> | ||
| <ItemGroup Condition=" '$(DisableImplicitNamespaceImports_Android)' != 'true' "> | ||
| <Import Include="Android.App" /> | ||
| <Import Include="Android.OS" /> | ||
| <Import Include="Android.Runtime" /> | ||
| <Import Include="Android.Widget" /> | ||
| </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
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
24 changes: 24 additions & 0 deletions
24
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/DotNet/MainActivity.cs
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 |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| namespace ${ROOT_NAMESPACE} | ||
| { | ||
| [Register ("${JAVA_PACKAGENAME}.MainActivity"), Activity (Label = "${PROJECT_NAME}", MainLauncher = true, Icon = "@drawable/icon")] | ||
| public class MainActivity : Activity | ||
| { | ||
| int count = 1; | ||
|
|
||
| protected override void OnCreate (Bundle? bundle) | ||
| { | ||
| base.OnCreate (bundle); | ||
|
|
||
| // Set our view from the "main" layout resource | ||
| SetContentView (Resource.Layout.Main); | ||
|
|
||
| var button = FindViewById<Button> (Resource.Id.myButton); | ||
| button!.Click += delegate { | ||
| button.Text = string.Format ("{0} clicks!", count++); | ||
| }; | ||
|
|
||
| //${AFTER_ONCREATE} | ||
| } | ||
| } | ||
| //${AFTER_MAINACTIVITY} | ||
| } |
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