Skip to content
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

[workload] setup C# implicit global usings from MSBuild #3267

Merged
merged 1 commit into from
Nov 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<UseMaui>true</UseMaui>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
Expand Down
51 changes: 24 additions & 27 deletions src/Controls/samples/Controls.Sample.Tests/MauiTests.cs
Original file line number Diff line number Diff line change
@@ -1,36 +1,33 @@
using Microsoft.Maui.Controls;
using Microsoft.Maui.Graphics;
using Xunit;

namespace Controls.Sample.Tests
namespace Controls.Sample.Tests;

public class MauiTests
{
public class MauiTests
public MauiTests()
{
public MauiTests()
{
Device.PlatformServices = new MockPlatformServices();
}
Device.PlatformServices = new MockPlatformServices();
}

[Fact]
public void ShadowInitializesCorrectly()
{
// Arrange
const float expectedOpacity = 1.0f;
const float expectedRadius = 10.0f;
var expectedOffset = new Point(10, 10);
[Fact]
public void ShadowInitializesCorrectly()
{
// Arrange
const float expectedOpacity = 1.0f;
const float expectedRadius = 10.0f;
var expectedOffset = new Point(10, 10);

// Act
var shadow = new Shadow
{
Offset = expectedOffset,
Opacity = expectedOpacity,
Radius = expectedRadius
};
// Act
var shadow = new Shadow
{
Offset = expectedOffset,
Opacity = expectedOpacity,
Radius = expectedRadius
};

// Assert
Assert.Equal(expectedOffset, shadow.Offset);
Assert.Equal(expectedOpacity, shadow.Opacity);
Assert.Equal(expectedRadius, shadow.Radius);
}
// Assert
Assert.Equal(expectedOffset, shadow.Offset);
Assert.Equal(expectedOpacity, shadow.Opacity);
Assert.Equal(expectedRadius, shadow.Radius);
}
}
Original file line number Diff line number Diff line change
@@ -1,52 +1,44 @@
using System;
using System.IO;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Maui;
using Microsoft.Maui.Controls;
using System.Reflection;
using Microsoft.Maui.Controls.Internals;
using Microsoft.Maui.Graphics;

namespace Controls.Sample.Tests
{
public class MockPlatformServices : IPlatformServices
{
public string GetHash(string input) => string.Empty;
namespace Controls.Sample.Tests;

public string GetMD5Hash(string input) => string.Empty;
public class MockPlatformServices : IPlatformServices
{
public string GetHash(string input) => string.Empty;

public double GetNamedSize(NamedSize size, Type targetElement, bool useOldSizes) => 0;
public string GetMD5Hash(string input) => string.Empty;

public Color GetNamedColor(string name) => Colors.Transparent;
public double GetNamedSize(NamedSize size, Type targetElement, bool useOldSizes) => 0;

public void OpenUriAction(Uri uri)
{
}
public Color GetNamedColor(string name) => Colors.Transparent;

public bool IsInvokeRequired { get; } = false;
public void OpenUriAction(Uri uri)
{
}

public OSAppTheme RequestedTheme { get; } = OSAppTheme.Unspecified;
public bool IsInvokeRequired { get; } = false;

public string RuntimePlatform { get; set; } = string.Empty;
public OSAppTheme RequestedTheme { get; } = OSAppTheme.Unspecified;

public void BeginInvokeOnMainThread(Action action) => action();
public string RuntimePlatform { get; set; } = string.Empty;

public void StartTimer(TimeSpan interval, Func<bool> callback)
{
}
public void BeginInvokeOnMainThread(Action action) => action();

public Task<Stream> GetStreamAsync(Uri uri, CancellationToken cancellationToken)
=> Task.FromResult<Stream>(new MemoryStream());
public void StartTimer(TimeSpan interval, Func<bool> callback)
{
}

public Assembly[] GetAssemblies() => Array.Empty<Assembly>();
public Task<Stream> GetStreamAsync(Uri uri, CancellationToken cancellationToken)
=> Task.FromResult<Stream>(new MemoryStream());

public IIsolatedStorageFile? GetUserStoreForApplication() => null;
public Assembly[] GetAssemblies() => Array.Empty<Assembly>();

public void QuitApplication()
{
}
public IIsolatedStorageFile? GetUserStoreForApplication() => null;

public SizeRequest GetNativeSize(VisualElement view, double widthConstraint, double heightConstraint) => default;
public void QuitApplication()
{
}
}

public SizeRequest GetNativeSize(VisualElement view, double widthConstraint, double heightConstraint) => default;
}
14 changes: 0 additions & 14 deletions src/Templates/src/templates/maui-blazor/GlobalUsings.cs

This file was deleted.

1 change: 1 addition & 0 deletions src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<RootNamespace>MauiApp._1</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
<EnableDefaultCssItems>false</EnableDefaultCssItems>

Expand Down
1 change: 1 addition & 0 deletions src/Templates/src/templates/maui-lib/MauiLib1.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MauiLib1</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>

<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
Expand Down
14 changes: 0 additions & 14 deletions src/Templates/src/templates/maui-mobile/GlobalUsings.cs

This file was deleted.

1 change: 1 addition & 0 deletions src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<RootNamespace>MauiApp._1</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>

<!-- Display name -->
Expand Down
12 changes: 12 additions & 0 deletions src/Workload/Microsoft.Maui.Sdk/Sdk/AutoImport.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
<!-- all <ItemGroup/>'s must check if $(EnableDefaultMauiItems) is true -->
<Project>

<ItemGroup Condition=" '$(UseMaui)' == 'true' and ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable') ">
<!-- %(Sdk) is only here if something later needs to identify these -->
<Using Include="Microsoft.Extensions.DependencyInjection" Sdk="Maui" />
<Using Include="Microsoft.Maui" Sdk="Maui" />
<Using Include="Microsoft.Maui.Controls" Sdk="Maui" />
<Using Include="Microsoft.Maui.Controls.Hosting" Sdk="Maui" />
<Using Include="Microsoft.Maui.Controls.Xaml" Sdk="Maui" />
<Using Include="Microsoft.Maui.Graphics" Sdk="Maui" />
<Using Include="Microsoft.Maui.Essentials" Sdk="Maui" />
<Using Include="Microsoft.Maui.Hosting" Sdk="Maui" />
</ItemGroup>

<!-- Default .NET MAUI files-->
<ItemGroup Condition=" '$(EnableDefaultMauiItems)' == 'true' and '$(EnableDefaultEmbeddedResourceItems)' == 'true' ">
<MauiXaml Condition=" '$(EnableDefaultXamlItems)' == 'true' " Include="**\*.xaml" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,9 @@
<ProjectCapability Include="MauiCore" Condition=" '$(UseMaui)' == 'true' or '$(UseMauiCore)' == 'true' " />
<ProjectCapability Include="MauiEssentials" Condition=" '$(UseMaui)' == 'true' or '$(UseMauiEssentials)' == 'true' " />
</ItemGroup>
<!-- Remove platform-based @(Using) unless $(MauiEnablePlatformUsings) flag is set -->
<ItemGroup Condition=" '$(UseMaui)' == 'true' and '$(MauiEnablePlatformUsings)' != 'true' and ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable') ">
<Using Remove="@(Using->HasMetadata('Platform'))" />
</ItemGroup>
<Import Project="Microsoft.Maui.Controls.DefaultItems.targets" />
</Project>