Skip to content

Commit 4bfa27e

Browse files
wtgodbecaptainsafia
authored andcommitted
Undo RepoTasks workaround (#59058)
* Undo RepoTasks workaround * Update RepoTasks.tasks
1 parent c9a78d0 commit 4bfa27e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

eng/tools/RepoTasks/RepoTasks.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0</TargetFrameworks>
3+
<TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
44
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
55
<DefineConstants Condition="'$(TargetFramework)' == 'net472'">$(DefineConstants);BUILD_MSI_TASKS</DefineConstants>
66
<Optimize>false</Optimize>
@@ -31,7 +31,7 @@
3131
<Compile Remove="shared\CertificateGeneration\*.cs" />
3232
</ItemGroup>
3333

34-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
34+
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
3535
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
3636
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
3737
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />

eng/tools/RepoTasks/RepoTasks.tasks

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">net9.0</_RepoTaskAssemblyFolder>
3+
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">$(DefaultNetCoreTargetFramework)</_RepoTaskAssemblyFolder>
44
<_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472</_RepoTaskAssemblyFolder>
55
<_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\Release\$(_RepoTaskAssemblyFolder)\RepoTasks.dll</_RepoTaskAssembly>
66
</PropertyGroup>

0 commit comments

Comments
 (0)