Skip to content

Commit 866b93c

Browse files
committed
Enabled implicit usings for the repo. Files with Task conflicts, either defined a global alias for their project as MSBuildTask or individual file aliases.
1 parent 6b561af commit 866b93c

File tree

63 files changed

+99
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+99
-66
lines changed

Directory.Build.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,9 @@
4343
<!-- <TestRunnerAdditionalArguments>-parallel none</TestRunnerAdditionalArguments> -->
4444
</PropertyGroup>
4545

46+
<PropertyGroup>
47+
<ImplicitUsings>enable</ImplicitUsings>
48+
</PropertyGroup>
49+
4650
<Import Project="build/GenerateResxSource.targets" />
4751
</Project>

src/BlazorWasmSdk/Tasks/BlazorReadSatelliteAssemblyFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Microsoft.NET.Sdk.BlazorWebAssembly
1010
{
11-
public class BlazorReadSatelliteAssemblyFile : Task
11+
public class BlazorReadSatelliteAssemblyFile : MSBuildTask
1212
{
1313
[Output]
1414
public ITaskItem[] SatelliteAssembly { get; set; }

src/BlazorWasmSdk/Tasks/BlazorWriteSatelliteAssemblyFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace Microsoft.NET.Sdk.BlazorWebAssembly
1111
{
12-
public class BlazorWriteSatelliteAssemblyFile : Task
12+
public class BlazorWriteSatelliteAssemblyFile : MSBuildTask
1313
{
1414
[Required]
1515
public ITaskItem[] SatelliteAssembly { get; set; }

src/BlazorWasmSdk/Tasks/CreateBlazorTrimmerRootDescriptorFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace Microsoft.NET.Sdk.BlazorWebAssembly
1414
{
1515
// Based on https://github.com/mono/linker/blob/3b329b9481e300bcf4fb88a2eebf8cb5ef8b323b/src/ILLink.Tasks/CreateRootDescriptorFile.cs
16-
public class CreateBlazorTrimmerRootDescriptorFile : Task
16+
public class CreateBlazorTrimmerRootDescriptorFile : MSBuildTask
1717
{
1818
[Required]
1919
public ITaskItem[] Assemblies { get; set; }

src/BlazorWasmSdk/Tasks/GZipCompress.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace Microsoft.NET.Sdk.BlazorWebAssembly
1414
{
15-
public class GZipCompress : Task
15+
public class GZipCompress : MSBuildTask
1616
{
1717
[Required]
1818
public ITaskItem[] FilesToCompress { get; set; }

src/BlazorWasmSdk/Tasks/GenerateBlazorBootExtensionJson.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
namespace Microsoft.NET.Sdk.BlazorWebAssembly
1616
{
17-
public class GenerateBlazorBootExtensionJson : Task
17+
public class GenerateBlazorBootExtensionJson : MSBuildTask
1818
{
1919
[Required]
2020
public string OutputPath { get; set; }

src/BlazorWasmSdk/Tasks/GenerateBlazorWebAssemblyBootJson50.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
namespace Microsoft.NET.Sdk.BlazorWebAssembly
1616
{
17-
public class GenerateBlazorWebAssemblyBootJson50 : Task
17+
public class GenerateBlazorWebAssemblyBootJson50 : MSBuildTask
1818
{
1919
[Required]
2020
public string AssemblyPath { get; set; }

src/BlazorWasmSdk/Tasks/GenerateServiceWorkerAssetsManifest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace Microsoft.NET.Sdk.BlazorWebAssembly
1414
{
15-
public partial class GenerateServiceWorkerAssetsManifest : Task
15+
public partial class GenerateServiceWorkerAssetsManifest : MSBuildTask
1616
{
1717
[Required]
1818
public ITaskItem[] Assets { get; set; }

src/BlazorWasmSdk/Tasks/Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project>
1+
<Project>
22

33
<PropertyGroup>
44
<BlazorWasmSdkRoot>$(RepoRoot)\src\BlazorWasmSdk\</BlazorWasmSdkRoot>
@@ -89,5 +89,12 @@
8989
</ItemGroup>
9090
</Target>
9191

92+
<!-- Global usings -->
93+
<!-- See: https://learn.microsoft.com/dotnet/core/project-sdk/msbuild-props#using -->
94+
<ItemGroup>
95+
<!-- This causes conflicts with System.Threading.Tasks.Task. Giving it a unqiue alias avoids the conflict. -->
96+
<Using Include="Microsoft.Build.Utilities.Task" Alias="MSBuildTask" />
97+
</ItemGroup>
98+
9299
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
93100
</Project>

src/BuiltInTools/DotNetWatchTasks/FileSetSerializer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
using System.Runtime.Serialization.Json;
88
using System.Text;
99
using Microsoft.Build.Framework;
10-
using Microsoft.Build.Utilities;
1110
using Microsoft.DotNet.Watcher.Internal;
11+
using MSBuildTask = Microsoft.Build.Utilities.Task;
1212

1313
namespace DotNetWatchTasks
1414
{
15-
public class FileSetSerializer : Task
15+
public class FileSetSerializer : MSBuildTask
1616
{
1717
public ITaskItem[] WatchFiles { get; set; } = null!;
1818

0 commit comments

Comments
 (0)