xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[dotnet] Enable nullability in template projects. (#12118) 

And fix any warnings that came up.
This commit is contained in:
Rolf Bjarne Kvinge 2021-07-16 16:17:14 +02:00 коммит произвёл GitHub
Родитель ef0a179610
Коммит d307a844ad
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
10 изменённых файлов: 12 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/AppDelegate.cs
Просмотреть файл

@ -4,7 +4,7 @@ using UIKit;
namespace MacCatalystApp1 { namespace MacCatalystApp1 {
[Register ("AppDelegate")] [Register ("AppDelegate")]
public class AppDelegate : UIApplicationDelegate { public class AppDelegate : UIApplicationDelegate {
public override UIWindow Window { public override UIWindow? Window {
get; get;
set; set;
} }
@ -16,7 +16,7 @@ namespace MacCatalystApp1 {
// create a UIViewController with a single UILabel // create a UIViewController with a single UILabel
var vc = new UIViewController (); var vc = new UIViewController ();
vc.View.AddSubview (new UILabel (Window.Frame) { vc.View!.AddSubview (new UILabel (Window!.Frame) {
BackgroundColor = UIColor.White, BackgroundColor = UIColor.White,
TextAlignment = UITextAlignment.Center, TextAlignment = UITextAlignment.Center,
Text = "Hello, Catalyst!" Text = "Hello, Catalyst!"

1
dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/MacCatalystApp1.csproj
Просмотреть файл

@ -4,5 +4,6 @@
<RuntimeIdentifier>maccatalyst-x64</RuntimeIdentifier> <RuntimeIdentifier>maccatalyst-x64</RuntimeIdentifier>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystApp1</RootNamespace> <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystApp1</RootNamespace>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/SceneDelegate.cs
Просмотреть файл

@ -6,7 +6,7 @@ namespace MacCatalystApp1 {
public class SceneDelegate : UIResponder, IUIWindowSceneDelegate { public class SceneDelegate : UIResponder, IUIWindowSceneDelegate {
[Export ("window")] [Export ("window")]
public UIWindow Window { get; set; } public UIWindow? Window { get; set; }
[Export ("scene:willConnectToSession:options:")] [Export ("scene:willConnectToSession:options:")]
public void WillConnect (UIScene scene, UISceneSession session, UISceneConnectionOptions connectionOptions) public void WillConnect (UIScene scene, UISceneSession session, UISceneConnectionOptions connectionOptions)

4
dotnet/Templates/Microsoft.iOS.Templates/ios/AppDelegate.cs
Просмотреть файл

@ -4,7 +4,7 @@ using UIKit;
namespace iOSApp1 { namespace iOSApp1 {
[Register ("AppDelegate")] [Register ("AppDelegate")]
public class AppDelegate : UIApplicationDelegate { public class AppDelegate : UIApplicationDelegate {
public override UIWindow Window { public override UIWindow? Window {
get; get;
set; set;
} }
@ -16,7 +16,7 @@ namespace iOSApp1 {
// create a UIViewController with a single UILabel // create a UIViewController with a single UILabel
var vc = new UIViewController (); var vc = new UIViewController ();
vc.View.AddSubview (new UILabel (Window.Frame) { vc.View!.AddSubview (new UILabel (Window!.Frame) {
BackgroundColor = UIColor.White, BackgroundColor = UIColor.White,
TextAlignment = UITextAlignment.Center, TextAlignment = UITextAlignment.Center,
Text = "Hello, iOS!" Text = "Hello, iOS!"

2
dotnet/Templates/Microsoft.iOS.Templates/ios/SceneDelegate.cs
Просмотреть файл

@ -6,7 +6,7 @@ namespace iOSApp1 {
public class SceneDelegate : UIResponder, IUIWindowSceneDelegate { public class SceneDelegate : UIResponder, IUIWindowSceneDelegate {
[Export ("window")] [Export ("window")]
public UIWindow Window { get; set; } public UIWindow? Window { get; set; }
[Export ("scene:willConnectToSession:options:")] [Export ("scene:willConnectToSession:options:")]
public void WillConnect (UIScene scene, UISceneSession session, UISceneConnectionOptions connectionOptions) public void WillConnect (UIScene scene, UISceneSession session, UISceneConnectionOptions connectionOptions)

1
dotnet/Templates/Microsoft.iOS.Templates/ios/iOSApp1.csproj
Просмотреть файл

@ -3,5 +3,6 @@
<TargetFramework>net6.0-ios</TargetFramework> <TargetFramework>net6.0-ios</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">iOSApp1</RootNamespace> <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">iOSApp1</RootNamespace>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

1
dotnet/Templates/Microsoft.iOS.Templates/ioslib/iOSLib1.csproj
Просмотреть файл

@ -2,5 +2,6 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework> <TargetFramework>net6.0-ios</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">iOSLib1</RootNamespace> <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">iOSLib1</RootNamespace>
<Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

1
dotnet/Templates/Microsoft.macOS.Templates/macos/macOSApp1.csproj
Просмотреть файл

@ -3,5 +3,6 @@
<TargetFramework>net6.0-macos</TargetFramework> <TargetFramework>net6.0-macos</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">macOSApp1</RootNamespace> <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">macOSApp1</RootNamespace>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
dotnet/Templates/Microsoft.tvOS.Templates/tvos/AppDelegate.cs
Просмотреть файл

@ -4,7 +4,7 @@ using UIKit;
namespace tvOSApp1 { namespace tvOSApp1 {
[Register ("AppDelegate")] [Register ("AppDelegate")]
public class AppDelegate : UIApplicationDelegate { public class AppDelegate : UIApplicationDelegate {
public override UIWindow Window { public override UIWindow? Window {
get; get;
set; set;
} }

1
dotnet/Templates/Microsoft.tvOS.Templates/tvos/tvOSApp1.csproj
Просмотреть файл

@ -3,5 +3,6 @@
<TargetFramework>net6.0-tvos</TargetFramework> <TargetFramework>net6.0-tvos</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">tvOSApp1</RootNamespace> <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">tvOSApp1</RootNamespace>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
</Project> </Project>