diff --git a/eng/tools/RepoTasks/GenerateTestDevCert.cs b/eng/tools/RepoTasks/GenerateTestDevCert.cs index 37a4b33216ed..273ba9646832 100644 --- a/eng/tools/RepoTasks/GenerateTestDevCert.cs +++ b/eng/tools/RepoTasks/GenerateTestDevCert.cs @@ -13,7 +13,7 @@ namespace RepoTasks; /// /// Generates the test HTTPs certificate used by the template tests /// -public class GenerateTestDevCert : Task +public class GenerateTestDevCert : Microsoft.Build.Utilities.Task { [Required] public string CertificatePath { get; private set; } diff --git a/eng/tools/RepoTasks/GetMsiProperty.cs b/eng/tools/RepoTasks/GetMsiProperty.cs deleted file mode 100644 index f5bbdf4ce641..000000000000 --- a/eng/tools/RepoTasks/GetMsiProperty.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -#if BUILD_MSI_TASKS -using System; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Deployment.WindowsInstaller.Package; - -namespace RepoTasks; - -public class GetMsiProperty : Microsoft.Build.Utilities.Task -{ - [Required] - public string InstallPackage { get; set; } - - [Required] - public string Property { get; set; } - - [Output] - public string Value { get; set; } - - public override bool Execute() - { - try - { - using (var package = new InstallPackage(InstallPackage, 0)) - { - Value = package.Property[Property]; - } - } - catch (Exception exception) - { - Log.LogErrorFromException(exception); - } - return !Log.HasLoggedErrors; - } -} -#endif diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj index e003f2e0d130..7c8b6660d674 100644 --- a/eng/tools/RepoTasks/RepoTasks.csproj +++ b/eng/tools/RepoTasks/RepoTasks.csproj @@ -1,9 +1,8 @@ - $(BundledNETCoreAppTargetFramework) - $(TargetFrameworks);net472 - $(DefineConstants);BUILD_MSI_TASKS + $(BundledNETCoreAppTargetFramework) + false false embedded true @@ -22,39 +21,14 @@ - - - - - - - - - - - - - - - - - + - - - - - - - $(WiXSdkPath)\Microsoft.Deployment.WindowsInstaller.dll - - - $(WiXSdkPath)\Microsoft.Deployment.WindowsInstaller.Package.dll - + + diff --git a/eng/tools/RepoTasks/RepoTasks.tasks b/eng/tools/RepoTasks/RepoTasks.tasks index 3a47e89428d5..81187ffe6af3 100644 --- a/eng/tools/RepoTasks/RepoTasks.tasks +++ b/eng/tools/RepoTasks/RepoTasks.tasks @@ -1,15 +1,14 @@ + - <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">net11.0 - <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472 - <_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\$(Configuration)\$(_RepoTaskAssemblyFolder)\RepoTasks.dll + <_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\$(Configuration)\RepoTasks.dll - - - - - + + + + +