diff --git a/eng/TargetFrameworkDefaults.props b/eng/TargetFrameworkDefaults.props index 89f2a8eb94c..ca3546e8c55 100644 --- a/eng/TargetFrameworkDefaults.props +++ b/eng/TargetFrameworkDefaults.props @@ -6,7 +6,7 @@ --> netcoreapp3.1 - net5.0 + net6.0 diff --git a/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj b/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj index 653588d240f..98b2095803f 100644 --- a/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj +++ b/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj @@ -3,6 +3,7 @@ netcoreapp3.1 enable + true diff --git a/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj b/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj index 324725f5426..ac04f51722d 100644 --- a/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj +++ b/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj @@ -2,6 +2,7 @@ net472;netstandard2.0 + netstandard2.0 true diff --git a/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj b/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj index bb3c5eeb152..bcc3d7179d4 100644 --- a/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj +++ b/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj @@ -3,6 +3,7 @@ netcoreapp3.1;net472 true + true diff --git a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj index 7cc96f188ed..63544dd9c13 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj +++ b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj @@ -19,7 +19,7 @@ false false <_GeneratedVersionFilePath>$(IntermediateOutputPath)DefaultVersions.Generated.props - 3021;NU5105 + 3021;NU5105;SYSLIB0013 diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/CalculateAssemblyAndFileVersions.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/CalculateAssemblyAndFileVersions.cs index b65c0985bc3..4eae5836756 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/CalculateAssemblyAndFileVersions.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/CalculateAssemblyAndFileVersions.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Arcade.Sdk /// File version has 4 parts and need to increase every official build.This is especially important when building MSIs. /// See https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Versioning.md#assembly-version. /// - public class CalculateAssemblyAndFileVersions : Task + public class CalculateAssemblyAndFileVersions : Microsoft.Build.Utilities.Task { private const int MaxMinor = 654; private const int MaxBuild = 9999; diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/CheckRequiredDotNetVersion.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/CheckRequiredDotNetVersion.cs index 6819daa3016..8b49d82309c 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/CheckRequiredDotNetVersion.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/CheckRequiredDotNetVersion.cs @@ -11,7 +11,7 @@ namespace Microsoft.DotNet.Arcade.Sdk { - public class CheckRequiredDotNetVersion : Task + public class CheckRequiredDotNetVersion : Microsoft.Build.Utilities.Task { private static readonly string s_cacheKey = "CheckRequiredDotNetVersion-6ED0A075-A4B3-46B1-97D4-448558D515D3"; diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/CompareVersions.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/CompareVersions.cs index 3a8586d471a..27be9af27db 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/CompareVersions.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/CompareVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Arcade.Sdk { - public class CompareVersions : Task + public class CompareVersions : Microsoft.Build.Utilities.Task { [Required] public string Left { get; set; } diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/DownloadFile.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/DownloadFile.cs index 7f75eb23dae..3c8f19e9aca 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/DownloadFile.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/DownloadFile.cs @@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Arcade.Sdk { - public class DownloadFile : Task, ICancelableTask + public class DownloadFile : Microsoft.Build.Utilities.Task, ICancelableTask { /// /// List of URls to attempt download from. Accepted metadata are: diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/ExtractNgenMethodList.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/ExtractNgenMethodList.cs index 61d1373af99..579f86475e0 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/ExtractNgenMethodList.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/ExtractNgenMethodList.cs @@ -17,7 +17,7 @@ namespace Microsoft.DotNet.Arcade.Sdk /// Used to convert a raw XML dump from IBCMerge into the set of methods which will be NGEN'd when /// partial NGEN is enabled /// - public sealed class ExtractNgenMethodList : Task + public sealed class ExtractNgenMethodList : Microsoft.Build.Utilities.Task { /// /// This is the XML file produced by passing -dxml to ibcmerge. It will be transformed into the set of diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateChecksums.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateChecksums.cs index 8fa04acf84b..6370ce65532 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateChecksums.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateChecksums.cs @@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Arcade.Sdk { - public class GenerateChecksums : Task + public class GenerateChecksums : Microsoft.Build.Utilities.Task { /// /// An item collection of files for which to generate checksums. Each item must have metadata diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs index 20eea4a6d3b..dd4168581b0 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs @@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Arcade.Sdk { - public sealed class GenerateResxSource : Task + public sealed class GenerateResxSource : Microsoft.Build.Utilities.Task { private const int maxDocCommentLength = 256; diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateSourcePackageSourceLinkTargetsFile.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateSourcePackageSourceLinkTargetsFile.cs index de64492076d..bdfc35ffd2f 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateSourcePackageSourceLinkTargetsFile.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateSourcePackageSourceLinkTargetsFile.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Arcade.Sdk { - public sealed class GenerateSourcePackageSourceLinkTargetsFile : Task + public sealed class GenerateSourcePackageSourceLinkTargetsFile : Microsoft.Build.Utilities.Task { [Required] public string ProjectDirectory { get; set; } diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GetAssemblyFullName.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GetAssemblyFullName.cs index e507dc6f8cc..f04c6095010 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/GetAssemblyFullName.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GetAssemblyFullName.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Arcade.Sdk { - public class GetAssemblyFullName : Task + public class GetAssemblyFullName : Microsoft.Build.Utilities.Task { [Required] public ITaskItem[] Items { get; set; } diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GetLicenseFilePath.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GetLicenseFilePath.cs index 308fad34a81..d195c79398e 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/GetLicenseFilePath.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GetLicenseFilePath.cs @@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Arcade.Sdk /// Finds a license file in the given directory. /// File is considered a license file if its name matches 'license(.txt|.md|)', ignoring case. /// - public class GetLicenseFilePath : Task + public class GetLicenseFilePath : Microsoft.Build.Utilities.Task { /// /// Full path to the directory to search for the license file. diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GroupItemsBy.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GroupItemsBy.cs index 649668f8727..cf8b54f8e31 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/GroupItemsBy.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GroupItemsBy.cs @@ -30,7 +30,7 @@ namespace Microsoft.DotNet.Arcade.Sdk /// ]]> /// /// - public sealed class GroupItemsBy : Task + public sealed class GroupItemsBy : Microsoft.Build.Utilities.Task { /// /// Items to group by their ItemSpec. diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetCore.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetCore.cs index 4e3a8f71e0e..c4369b78d95 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetCore.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetCore.cs @@ -19,7 +19,7 @@ public class InstallDotNetCore : AppDomainIsolatedTask { static InstallDotNetCore() => AssemblyResolution.Initialize(); #else - public class InstallDotNetCore : Task + public class InstallDotNetCore : Microsoft.Build.Utilities.Task { #endif public string VersionsPropsPath { get; set; } diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/LocateDotNet.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/LocateDotNet.cs index 6a2b1433839..de9e57de048 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/LocateDotNet.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/LocateDotNet.cs @@ -10,7 +10,7 @@ namespace Microsoft.DotNet.Arcade.Sdk { - public class LocateDotNet : Task + public class LocateDotNet : Microsoft.Build.Utilities.Task { private static readonly string s_cacheKey = "LocateDotNet-FCDFF825-F35B-4601-9CB5-74DCA498B589"; diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/SaveItems.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/SaveItems.cs index 05dc27ee121..48c57dc7dc5 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/SaveItems.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/SaveItems.cs @@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Arcade.Sdk /// This task writes msbuild Items with their metadata to a props file. /// Useful to statically save a status of an Item that will be used later on by just importing the generated file. /// - public class SaveItems : Task + public class SaveItems : Microsoft.Build.Utilities.Task { [Required] public string ItemName { get; set; } diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/SetCorFlags.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/SetCorFlags.cs index 6db35be225d..593ba369bc9 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/SetCorFlags.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/SetCorFlags.cs @@ -18,7 +18,7 @@ public class SetCorFlags : AppDomainIsolatedTask { static SetCorFlags() => AssemblyResolution.Initialize(); #else - public class SetCorFlags : Task + public class SetCorFlags : Microsoft.Build.Utilities.Task { #endif [Required] diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/SingleError.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/SingleError.cs index d190df39854..779f1e2698d 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/SingleError.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/SingleError.cs @@ -6,7 +6,7 @@ namespace Microsoft.DotNet.Arcade.Sdk { - public sealed class SingleError : Task + public sealed class SingleError : Microsoft.Build.Utilities.Task { private static readonly string s_cacheKeyPrefix = "SingleError-F88E25C6-1488-4E81-A458-A0921794E6E3:"; diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/AddSourceToNuGetConfig.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/AddSourceToNuGetConfig.cs index b30fe953721..30a5c3447b5 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/AddSourceToNuGetConfig.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/AddSourceToNuGetConfig.cs @@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Arcade.Sdk.SourceBuild /// also by default adds a 'clear' element if none exists, to avoid /// unintended leaks from the build environment. /// - public class AddSourceToNuGetConfig : Task + public class AddSourceToNuGetConfig : Microsoft.Build.Utilities.Task { [Required] public string NuGetConfigFile { get; set; } diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/ReadSourceBuildIntermediateNupkgDependencies.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/ReadSourceBuildIntermediateNupkgDependencies.cs index 806fa0f9869..0a2488a9ed9 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/ReadSourceBuildIntermediateNupkgDependencies.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/ReadSourceBuildIntermediateNupkgDependencies.cs @@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Arcade.Sdk.SourceBuild /// Reads entries in a Version.Details.xml file to find intermediate nupkg dependencies. For /// each dependency with a "SourceBuild" element, adds an item to the "Dependencies" output. /// - public class ReadSourceBuildIntermediateNupkgDependencies : Task + public class ReadSourceBuildIntermediateNupkgDependencies : Microsoft.Build.Utilities.Task { [Required] public string VersionDetailsXmlFile { get; set; } diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/Unsign.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/Unsign.cs index 11ea33e31a4..934939e265d 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/Unsign.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/Unsign.cs @@ -18,7 +18,7 @@ public sealed class Unsign : AppDomainIsolatedTask { static Unsign() => AssemblyResolution.Initialize(); #else - public class Unsign : Task + public class Unsign : Microsoft.Build.Utilities.Task { #endif [Required] diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/ValidateLicense.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/ValidateLicense.cs index 94f2e37a041..7cff00a0888 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/ValidateLicense.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/ValidateLicense.cs @@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Arcade.Sdk /// /// Checks that the content of two license files is the same modulo line breaks, leading and trailing whitespace. /// - public class ValidateLicense : Task + public class ValidateLicense : Microsoft.Build.Utilities.Task { /// /// Full path to the file that contains the license text to be validated. diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/ConfigureInputFeed.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/ConfigureInputFeed.cs index fc3817a1235..4ccefc8586c 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/ConfigureInputFeed.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/ConfigureInputFeed.cs @@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Build.Tasks.Feed { - public class ConfigureInputFeed : Task + public class ConfigureInputFeed : Microsoft.Build.Utilities.Task { [Required] public ITaskItem[] EnableFeeds { get; set; } diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/LaunchDebugger.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/LaunchDebugger.cs index a85b837ff22..86eba95f8e1 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/LaunchDebugger.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/LaunchDebugger.cs @@ -3,7 +3,7 @@ namespace Microsoft.DotNet.Build.Tasks.Feed { - public class LaunchDebugger : Task + public class LaunchDebugger : Microsoft.Build.Utilities.Task { public override bool Execute() { diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AzureConnectionStringBuildTask.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AzureConnectionStringBuildTask.cs index 82faa5ab514..f49268710b5 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AzureConnectionStringBuildTask.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AzureConnectionStringBuildTask.cs @@ -6,7 +6,7 @@ namespace Microsoft.DotNet.Build.CloudTestTasks { - public abstract class AzureConnectionStringBuildTask : Task + public abstract class AzureConnectionStringBuildTask : Microsoft.Build.Utilities.Task { /// /// Azure Storage account connection string. Supersedes Account Key / Name. diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateNuSpec.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateNuSpec.cs index 00f126a2222..7e1604b853d 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateNuSpec.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateNuSpec.cs @@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Build.Tasks.Packaging { - public class GenerateNuSpec : Task + public class GenerateNuSpec : Microsoft.Build.Utilities.Task { private static readonly XNamespace NuSpecXmlNamespace = @"http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd"; diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeJsonValues.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeJsonValues.cs index 43a35e4fec3..910dd33ce4d 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeJsonValues.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeJsonValues.cs @@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Build.Tasks.Packaging { // Read a runtime.json file into an msbuild item group - public class GetRuntimeJsonValues : Task + public class GetRuntimeJsonValues : Microsoft.Build.Utilities.Task { // runtime.json file path [Required] diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeTargets.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeTargets.cs index 4cb5bd43827..960d9f830a9 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeTargets.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeTargets.cs @@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Build.Tasks.Packaging { - public class GetRuntimeTargets : Task + public class GetRuntimeTargets : Microsoft.Build.Utilities.Task { // runtime.json file path [Required] diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj index 7b4feb8805a..57f5cfb9da9 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj @@ -87,7 +87,7 @@ <_candidatePackageFolder>%(_candidatPackageFolders.Identity) - <_runtimeJsonSubPath>Microsoft.NETCore.Platforms\2.1.0\runtime.json + <_runtimeJsonSubPath>Microsoft.NETCore.Platforms\$(MicrosoftNETCorePlatformsVersion)\runtime.json <_runtimeJsonPath Condition="'$(_runtimeJsonPath)' == '' AND Exists('$(_candidatePackageFolder)\$(_runtimeJsonSubPath)')">$(_candidatePackageFolder)\$(_runtimeJsonSubPath) <_runtimeJsonPath Condition="'$(_runtimeJsonPath)' == '' AND Exists('$(_candidatePackageFolder)\$(_runtimeJsonSubPath.ToLower())')">$(_candidatePackageFolder)\$(_runtimeJsonSubPath.ToLower()) diff --git a/src/Microsoft.DotNet.Build.Tasks.Templating/src/GenerateFileFromTemplate.cs b/src/Microsoft.DotNet.Build.Tasks.Templating/src/GenerateFileFromTemplate.cs index 140e1bd01a1..955e73da518 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Templating/src/GenerateFileFromTemplate.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Templating/src/GenerateFileFromTemplate.cs @@ -27,7 +27,7 @@ namespace Microsoft.DotNet.Build.Tasks.Templating /// /// /// - public class GenerateFileFromTemplate : Task + public class GenerateFileFromTemplate : Microsoft.Build.Utilities.Task { /// /// The template file using the variable syntax ${VarName}. diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/FindLatestDrop.cs b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/FindLatestDrop.cs index 7609b913522..4fe8d7add66 100644 --- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/FindLatestDrop.cs +++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/FindLatestDrop.cs @@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Build.Tasks.VisualStudio /// /// Find the latest drop in a JSON list of VS drops. /// - public sealed class FindLatestDrop : Task + public sealed class FindLatestDrop : Microsoft.Build.Utilities.Task { /// /// Full path to JSON file containing list of drops. diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingInputFiles.cs b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingInputFiles.cs index efc47343913..e80f4b68501 100644 --- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingInputFiles.cs +++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingInputFiles.cs @@ -16,7 +16,7 @@ namespace Microsoft.DotNet.Build.Tasks.VisualStudio /// Generates OptProf training input files for VS components listed in OptProf.json file and /// their VSIX files located in the specified directory. /// - public sealed class GenerateTrainingInputFiles : Task + public sealed class GenerateTrainingInputFiles : Microsoft.Build.Utilities.Task { /// /// Absolute path to the OptProf.json config file. diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingPropsFile.cs b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingPropsFile.cs index 4a7f5c59c46..9b182998d8f 100644 --- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingPropsFile.cs +++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingPropsFile.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Build.Tasks.VisualStudio /// /// Generates a .props file pointing to a drops URL where IBC optimization inputs will be uploaded. /// - public sealed class GenerateTrainingPropsFile : Task + public sealed class GenerateTrainingPropsFile : Microsoft.Build.Utilities.Task { private const string ProductDropNamePrefix = "Products/"; diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GetRunSettingsSessionConfiguration.cs b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GetRunSettingsSessionConfiguration.cs index a541891e895..f827518d6bc 100644 --- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GetRunSettingsSessionConfiguration.cs +++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GetRunSettingsSessionConfiguration.cs @@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Build.Tasks.VisualStudio /// Calculates the SessionConfiguration to be used in .runsettings for OptProf training /// based on given OptProf.json configuration and VS bootstrapper information. /// - public sealed class GetRunSettingsSessionConfiguration : Task + public sealed class GetRunSettingsSessionConfiguration : Microsoft.Build.Utilities.Task { /// /// Absolute path to the OptProf.json config file. diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/FinalizeInsertionVsixFile.cs b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/FinalizeInsertionVsixFile.cs index 7ac388f9f34..ad8211eb5cd 100644 --- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/FinalizeInsertionVsixFile.cs +++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/FinalizeInsertionVsixFile.cs @@ -20,7 +20,7 @@ namespace Microsoft.DotNet.Build.Tasks.VisualStudio /// /// Replaces Experimental="true" attribute of the Installation element with SystemComponent="true" in the VSIX manifest file. /// - public sealed class FinalizeInsertionVsixFile : Task + public sealed class FinalizeInsertionVsixFile : Microsoft.Build.Utilities.Task { private const string VsixManifestPartName = "/extension.vsixmanifest"; private const string VsixNamespace = "http://schemas.microsoft.com/developer/vsx-schema/2011"; diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/GetPkgDefAssemblyDependencyGuid.cs b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/GetPkgDefAssemblyDependencyGuid.cs index 2830793fab2..220842ad890 100644 --- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/GetPkgDefAssemblyDependencyGuid.cs +++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/GetPkgDefAssemblyDependencyGuid.cs @@ -17,7 +17,7 @@ namespace Microsoft.DotNet.Build.Tasks.VisualStudio /// Calculates Guid used in .pkgdef files for codeBase and bindingRedirect entries. /// The implementation matches Microsoft.VisualStudio.Shell.ProvideDependentAssemblyAttribute. /// - public sealed class GetPkgDefAssemblyDependencyGuid : Task + public sealed class GetPkgDefAssemblyDependencyGuid : Microsoft.Build.Utilities.Task { [Required] public ITaskItem[] Items { get; set; } diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateTaskBase.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateTaskBase.cs index 5c0e0163053..2f64819c60a 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateTaskBase.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateTaskBase.cs @@ -10,7 +10,7 @@ namespace Microsoft.DotNet.Build.Tasks.Workloads { - public abstract class GenerateTaskBase : Task + public abstract class GenerateTaskBase : Microsoft.Build.Utilities.Task { public const int MaxPayloadRelativePath = 182; diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioManifest.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioManifest.cs index cf86b4d756e..825d9e887a4 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioManifest.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioManifest.cs @@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Build.Tasks.Workloads /// MSBuild task for generating a Visual Studio manifest project (.vsmanproj). The generated project can be used /// to create a manifest (.vsman) by merging JSON manifest files produced from one or more SWIX project. /// - public class GenerateVisualStudioManifest : Task + public class GenerateVisualStudioManifest : Microsoft.Build.Utilities.Task { /// /// The base path where the project source will be generated. diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GetWorkloadPackPackageReferences.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GetWorkloadPackPackageReferences.cs index ddfac1f4afb..7af8eba77db 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GetWorkloadPackPackageReferences.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GetWorkloadPackPackageReferences.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Build.Tasks.Workloads { - public class GetWorkloadPackPackageReferences : Task + public class GetWorkloadPackPackageReferences : Microsoft.Build.Utilities.Task { public string ProjectFile { diff --git a/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj b/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj index 30474e210e3..c964fbea18d 100644 --- a/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj +++ b/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj @@ -3,7 +3,7 @@ netcoreapp3.1;net472 - netcoreapp3.1 + net6.0 true Aka.ms link manager diff --git a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj index db51ae171ed..bca9958d17e 100644 --- a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj +++ b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj @@ -2,6 +2,7 @@ $(TargetFrameworkForNETSDK);net472 + $(TargetFrameworkForNETSDK) MSBuildSdk false true diff --git a/src/Microsoft.DotNet.Helix/Sdk/BaseTask.cs b/src/Microsoft.DotNet.Helix/Sdk/BaseTask.cs index 333047b7ae0..cc63c88b124 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/BaseTask.cs +++ b/src/Microsoft.DotNet.Helix/Sdk/BaseTask.cs @@ -2,7 +2,7 @@ namespace Microsoft.DotNet.Helix { - public abstract partial class BaseTask : Task + public abstract partial class BaseTask : Microsoft.Build.Utilities.Task { } } diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj b/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj index c532b91fa4d..d00c49a4d0b 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj +++ b/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj @@ -2,7 +2,7 @@ net472;netcoreapp3.1 - netcoreapp3.1 + net6.0 true MSBuildSdk diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/src/ReplacePackageParts.cs b/src/Microsoft.DotNet.NuGetRepack/tasks/src/ReplacePackageParts.cs index 8e6563b8d14..0d9d22ec6a5 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tasks/src/ReplacePackageParts.cs +++ b/src/Microsoft.DotNet.NuGetRepack/tasks/src/ReplacePackageParts.cs @@ -23,7 +23,7 @@ public sealed class ReplacePackageParts : AppDomainIsolatedTask { static ReplacePackageParts() => AssemblyResolution.Initialize(); #else - public sealed class ReplacePackageParts : Task + public sealed class ReplacePackageParts : Microsoft.Build.Utilities.Task { #endif /// diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/src/UpdatePackageVersionTask.cs b/src/Microsoft.DotNet.NuGetRepack/tasks/src/UpdatePackageVersionTask.cs index 863dd049ca4..8f922025d15 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tasks/src/UpdatePackageVersionTask.cs +++ b/src/Microsoft.DotNet.NuGetRepack/tasks/src/UpdatePackageVersionTask.cs @@ -16,7 +16,7 @@ public sealed class UpdatePackageVersionTask : AppDomainIsolatedTask { static UpdatePackageVersionTask() => AssemblyResolution.Initialize(); #else - public class UpdatePackageVersionTask : Task + public class UpdatePackageVersionTask : Microsoft.Build.Utilities.Task { #endif public string VersionKind { get; set; } diff --git a/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj index ef713a0f154..824dc8b66c1 100644 --- a/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj +++ b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj @@ -2,6 +2,7 @@ netcoreapp3.1;net472 + net6.0 MSBuildSdk false true diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj index e1d14cb98c5..9627a033768 100644 --- a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj +++ b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj @@ -2,6 +2,7 @@ net472;netcoreapp3.1 + net6.0 preview false diff --git a/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj b/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj index 8ec571aeb81..7a89dfe9dfc 100644 --- a/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj +++ b/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj @@ -2,7 +2,7 @@ net472;netcoreapp3.1 - netcoreapp3.1 + net6.0 true Latest true diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/src/ReadNuGetPackageInfos.cs b/src/Microsoft.DotNet.SourceBuild/tasks/src/ReadNuGetPackageInfos.cs index 4df9c4df567..bcb95bf3191 100644 --- a/src/Microsoft.DotNet.SourceBuild/tasks/src/ReadNuGetPackageInfos.cs +++ b/src/Microsoft.DotNet.SourceBuild/tasks/src/ReadNuGetPackageInfos.cs @@ -10,7 +10,7 @@ namespace Microsoft.DotNet.SourceBuild.Tasks { - public class ReadNuGetPackageInfos : Task + public class ReadNuGetPackageInfos : Microsoft.Build.Utilities.Task { [Required] public string[] PackagePaths { get; set; } diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/ValidateUsageAgainstBaseline.cs b/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/ValidateUsageAgainstBaseline.cs index 5cb140d023d..f8b389b5268 100644 --- a/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/ValidateUsageAgainstBaseline.cs +++ b/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/ValidateUsageAgainstBaseline.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport { - public class ValidateUsageAgainstBaseline : Task + public class ValidateUsageAgainstBaseline : Microsoft.Build.Utilities.Task { [Required] public string DataFile { get; set; } diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WritePackageUsageData.cs b/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WritePackageUsageData.cs index 15b504d0112..caf7252a163 100644 --- a/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WritePackageUsageData.cs +++ b/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WritePackageUsageData.cs @@ -17,7 +17,7 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport { - public class WritePackageUsageData : Task + public class WritePackageUsageData : Microsoft.Build.Utilities.Task { public string[] RestoredPackageFiles { get; set; } public string[] TarballPrebuiltPackageFiles { get; set; } diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WriteUsageReports.cs b/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WriteUsageReports.cs index 784919651f9..e44e94f30be 100644 --- a/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WriteUsageReports.cs +++ b/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WriteUsageReports.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport { - public class WriteUsageReports : Task + public class WriteUsageReports : Microsoft.Build.Utilities.Task { private const string SnapshotPrefix = "PackageVersions.props.pre."; private const string SnapshotSuffix = ".xml"; diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/src/WriteBuildOutputProps.cs b/src/Microsoft.DotNet.SourceBuild/tasks/src/WriteBuildOutputProps.cs index 4ac4cbcf166..1b32c5f1112 100644 --- a/src/Microsoft.DotNet.SourceBuild/tasks/src/WriteBuildOutputProps.cs +++ b/src/Microsoft.DotNet.SourceBuild/tasks/src/WriteBuildOutputProps.cs @@ -13,7 +13,7 @@ namespace Microsoft.DotNet.SourceBuild.Tasks { - public class WriteBuildOutputProps : Task + public class WriteBuildOutputProps : Microsoft.Build.Utilities.Task { private static readonly Regex InvalidElementNameCharRegex = new Regex(@"(^|[^A-Za-z0-9])(?.)"); diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/GenerateSwaggerCode.cs b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/GenerateSwaggerCode.cs index 6482632531c..2c03502ec39 100644 --- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/GenerateSwaggerCode.cs +++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/GenerateSwaggerCode.cs @@ -13,7 +13,7 @@ namespace Microsoft.DotNet.SwaggerGenerator.MSBuild { - public class GenerateSwaggerCode : Task + public class GenerateSwaggerCode : Microsoft.Build.Utilities.Task { [Required] public string SwaggerDocumentUri { get; set; } diff --git a/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj b/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj index 208ffb033a2..2dfa124f05b 100644 --- a/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj +++ b/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj @@ -2,7 +2,7 @@ net472;netcoreapp3.1 - netcoreapp3.1 + net6.0 MSBuildSdk diff --git a/src/Microsoft.DotNet.VersionTools/tasks/src/BaseDependenciesTask.cs b/src/Microsoft.DotNet.VersionTools/tasks/src/BaseDependenciesTask.cs index c5e114065dc..936c37fbe8b 100644 --- a/src/Microsoft.DotNet.VersionTools/tasks/src/BaseDependenciesTask.cs +++ b/src/Microsoft.DotNet.VersionTools/tasks/src/BaseDependenciesTask.cs @@ -23,7 +23,7 @@ namespace Microsoft.DotNet.Build.Tasks.VersionTools { - public abstract class BaseDependenciesTask : Task + public abstract class BaseDependenciesTask : Microsoft.Build.Utilities.Task { internal const string RawUrlMetadataName = "RawUrl"; internal const string RawVersionsBaseUrlMetadataName = "RawVersionsBaseUrl"; diff --git a/src/Microsoft.DotNet.VersionTools/tasks/src/SubmitPullRequest.cs b/src/Microsoft.DotNet.VersionTools/tasks/src/SubmitPullRequest.cs index f3ea2050c83..7072b49765d 100644 --- a/src/Microsoft.DotNet.VersionTools/tasks/src/SubmitPullRequest.cs +++ b/src/Microsoft.DotNet.VersionTools/tasks/src/SubmitPullRequest.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Build.Tasks.VersionTools { - public class SubmitPullRequest : Task + public class SubmitPullRequest : Microsoft.Build.Utilities.Task { [Required] public string PullRequestServiceType { get; set; }