Skip to content

Commit 912bb74

Browse files
ViktorHoferViktorHofer
committed
Merge toolset-tasks and core-sdk-tasks and put in common location
Merge the local repo tasks that come from the installer and the sdk repositories together into a single one "sdk-tasks" and move it under src/Tasks/sdk-tasks/. Delete duplicate task files.
1 parent 211390f commit 912bb74

File tree

53 files changed

+84
-471
lines changed

Some content is hidden

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

53 files changed

+84
-471
lines changed

‎Directory.Build.targets

+1-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
<!-- Update KnownFrameworkReferences to target the right version of the runtime -->
5353
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
5454
and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))
55-
and '$(MSBuildProjectName)' != 'toolset-tasks'
56-
and '$(MSBuildProjectName)' != 'core-sdk-tasks'">
55+
and '$(MSBuildProjectName)' != 'sdk-tasks'">
5756
<FrameworkReference
5857
Update="Microsoft.NETCore.App"
5958
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"

‎documentation/project-docs/developer-guide.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ This should print `Hello World!`.
166166

167167
## Locked files
168168

169-
If you see error like ` error MSB3021: Unable to copy file "toolset-tasks.dll" to "toolset-tasks.dll". The process cannot access the file 'toolset-tasks.dll' because it is being used by another process.`
169+
If you see error like ` error MSB3021: Unable to copy file "sdk-tasks.dll" to "sdk-tasks.dll". The process cannot access the file 'sdk-tasks.dll' because it is being used by another process.`
170170

171171
You could run the following to stop all dotnet related processes
172172

‎sdk.sln

+2-9
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_nuget", "src\Layout\to
9191
EndProject
9292
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist", "src\Layout\redist\redist.csproj", "{AA273ACB-56FE-4F0C-8CC9-C2C45D31491D}"
9393
EndProject
94-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "toolset-tasks", "src\Layout\toolset-tasks\toolset-tasks.csproj", "{C687CA8D-9843-4045-BC20-917953F6C864}"
94+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "sdk-tasks", "src\Tasks\sdk-tasks\sdk-tasks.csproj", "{C687CA8D-9843-4045-BC20-917953F6C864}"
9595
EndProject
9696
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Msbuild.Tests.Utilities", "test\Msbuild.Tests.Utilities\Msbuild.Tests.Utilities.csproj", "{64294C35-9001-4FF9-975F-43D283EE5FA9}"
9797
EndProject
@@ -493,15 +493,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-format.UnitTests", "
493493
EndProject
494494
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{3FA6F1CB-295B-4414-B18F-93845917A8CD}"
495495
EndProject
496-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks", "src\Installer\core-sdk-tasks\core-sdk-tasks.csproj", "{5593C59B-442B-4783-8527-74F6E41668D9}"
497-
EndProject
498496
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "finalizer-build", "src\Installer\finalizer\finalizer-build.csproj", "{32DA04FF-A951-43EA-B2FA-86A825009A97}"
499497
EndProject
500498
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist-installer", "src\Installer\redist-installer\redist-installer.csproj", "{FAADC193-BA41-449D-97CE-0EF82836046A}"
501499
EndProject
502500
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VSTemplateLocator", "src\Installer\redist-installer\projects\VSTemplateLocator\VSTemplateLocator.csproj", "{0CBA5FB8-71A3-457A-89F3-E52B9602164A}"
503501
EndProject
504-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks.Tests", "test\core-sdk-tasks.Tests\core-sdk-tasks.Tests.csproj", "{21C21975-84C1-4A24-8E21-F7EC790A4584}"
502+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "sdk-tasks.Tests", "test\sdk-tasks.Tests\sdk-tasks.Tests.csproj", "{21C21975-84C1-4A24-8E21-F7EC790A4584}"
505503
EndProject
506504
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.WebTools.AspireService.Package", "src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.Package.csproj", "{19014C60-F87C-4CC7-AC0F-C41B6126EBCE}"
507505
EndProject
@@ -935,10 +933,6 @@ Global
935933
{D7495CE7-64E5-4715-9304-799A41EC1D71}.Debug|Any CPU.Build.0 = Debug|Any CPU
936934
{D7495CE7-64E5-4715-9304-799A41EC1D71}.Release|Any CPU.ActiveCfg = Release|Any CPU
937935
{D7495CE7-64E5-4715-9304-799A41EC1D71}.Release|Any CPU.Build.0 = Release|Any CPU
938-
{5593C59B-442B-4783-8527-74F6E41668D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
939-
{5593C59B-442B-4783-8527-74F6E41668D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
940-
{5593C59B-442B-4783-8527-74F6E41668D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
941-
{5593C59B-442B-4783-8527-74F6E41668D9}.Release|Any CPU.Build.0 = Release|Any CPU
942936
{32DA04FF-A951-43EA-B2FA-86A825009A97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
943937
{32DA04FF-A951-43EA-B2FA-86A825009A97}.Debug|Any CPU.Build.0 = Debug|Any CPU
944938
{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1139,7 +1133,6 @@ Global
11391133
{7382A1CB-AA9A-4136-A548-17D7A67C6B0C} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
11401134
{D7495CE7-64E5-4715-9304-799A41EC1D71} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
11411135
{3FA6F1CB-295B-4414-B18F-93845917A8CD} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E}
1142-
{5593C59B-442B-4783-8527-74F6E41668D9} = {3FA6F1CB-295B-4414-B18F-93845917A8CD}
11431136
{32DA04FF-A951-43EA-B2FA-86A825009A97} = {3FA6F1CB-295B-4414-B18F-93845917A8CD}
11441137
{FAADC193-BA41-449D-97CE-0EF82836046A} = {3FA6F1CB-295B-4414-B18F-93845917A8CD}
11451138
{0CBA5FB8-71A3-457A-89F3-E52B9602164A} = {3FA6F1CB-295B-4414-B18F-93845917A8CD}

‎source-build.slnf

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@
2222
"src\\Containers\\Microsoft.NET.Build.Containers\\Microsoft.NET.Build.Containers.csproj",
2323
"src\\Containers\\packaging\\package.csproj",
2424
"src\\Installer\\redist-installer\\redist-installer.csproj",
25-
"src\\Installer\\core-sdk-tasks\\core-sdk-tasks.csproj",
2625
"src\\Layout\\redist\\redist.csproj",
2726
"src\\Layout\\tool_fsharp\\tool_fsc.csproj",
2827
"src\\Layout\\tool_msbuild\\tool_msbuild.csproj",
2928
"src\\Layout\\tool_nuget\\tool_nuget.csproj",
30-
"src\\Layout\\toolset-tasks\\toolset-tasks.csproj",
3129
"src\\Microsoft.DotNet.TemplateLocator\\Microsoft.DotNet.TemplateLocator.csproj",
3230
"src\\Microsoft.Win32.Msi\\Microsoft.Win32.Msi.csproj",
3331
"src\\RazorSdk\\Tasks\\Microsoft.NET.Sdk.Razor.Tasks.csproj",
@@ -38,6 +36,7 @@
3836
"src\\Resolvers\\Microsoft.NET.Sdk.WorkloadManifestReader\\Microsoft.NET.Sdk.WorkloadManifestReader.csproj",
3937
"src\\StaticWebAssetsSdk\\Tasks\\Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj",
4038
"src\\StaticWebAssetsSdk\\Tool\\Microsoft.NET.Sdk.StaticWebAssets.Tool.csproj",
39+
"src\\Tasks\\sdk-tasks\\sdk-tasks.csproj",
4140
"src\\Tasks\\Microsoft.NET.Build.Extensions.Tasks\\Microsoft.NET.Build.Extensions.Tasks.csproj",
4241
"src\\Tasks\\Microsoft.NET.Build.Tasks\\Microsoft.NET.Build.Tasks.csproj",
4342
"src\\WasmSdk\\Tasks\\Microsoft.NET.Sdk.WebAssembly.Tasks.csproj",

‎src/Compatibility/ApiCompat/apicompat.slnf

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"src\\Compatibility\\ApiCompat\\Microsoft.DotNet.ApiCompatibility\\Microsoft.DotNet.ApiCompatibility.csproj",
1111
"src\\Compatibility\\ApiCompat\\Microsoft.DotNet.PackageValidation\\Microsoft.DotNet.PackageValidation.csproj",
1212
"src\\Compatibility\\Microsoft.DotNet.ApiSymbolExtensions\\Microsoft.DotNet.ApiSymbolExtensions.csproj",
13-
"src\\Layout\\toolset-tasks\\toolset-tasks.csproj",
13+
"src\\Tasks\\sdk-tasks\\sdk-tasks.csproj",
1414
"test\\Microsoft.DotNet.ApiCompat.IntegrationTests\\Microsoft.DotNet.ApiCompat.IntegrationTests.csproj",
1515
"test\\Microsoft.DotNet.ApiCompat.Tests\\Microsoft.DotNet.ApiCompat.Tests.csproj",
1616
"test\\Microsoft.DotNet.ApiCompatibility.Tests\\Microsoft.DotNet.ApiCompatibility.Tests.csproj",

‎src/Compatibility/GenAPI/genapi.slnf

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"src\\Compatibility\\GenAPI\\Microsoft.DotNet.GenAPI.Tool\\Microsoft.DotNet.GenAPI.Tool.csproj",
99
"src\\Compatibility\\GenAPI\\Microsoft.DotNet.GenAPI\\Microsoft.DotNet.GenAPI.csproj",
1010
"src\\Compatibility\\Microsoft.DotNet.ApiSymbolExtensions\\Microsoft.DotNet.ApiSymbolExtensions.csproj",
11-
"src\\Layout\\toolset-tasks\\toolset-tasks.csproj",
11+
"src\\Tasks\\sdk-tasks\\sdk-tasks.csproj",
1212
"test\\Microsoft.DotNet.ApiSymbolExtensions.Tests\\Microsoft.DotNet.ApiSymbolExtensions.Tests.csproj",
1313
"test\\Microsoft.DotNet.GenAPI.Tests\\Microsoft.DotNet.GenAPI.Tests.csproj",
1414
"test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj"

‎src/Installer/core-sdk-tasks/ZipFileCreateFromDirectory.cs

-127
This file was deleted.

‎src/Installer/redist-installer/projects/VSMSBuildExtensions/VSMSBuildExtensions.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
<ProjectReference Include="$(RepoRoot)src\Resolvers\Microsoft.DotNet.MSBuildSdkResolver\Microsoft.DotNet.MSBuildSdkResolver.csproj" ReferenceOutputAssembly="false" />
2525
</ItemGroup>
2626

27-
<!-- Shared infra to build and use the BuildCoreSdkTasks -->
28-
<Import Project="..\..\targets\BuildCoreSdkTasks.targets" />
27+
<!-- Shared infra to build and use the sdk-tasks -->
28+
<Import Project="$(RepoRoot)src\Tasks\sdk-tasks\sdk-tasks.InTree.targets" />
2929

30-
<Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="BuildCoreSdkTasks;ResolveProjectReferences">
30+
<Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">
3131
<PropertyGroup>
3232
<MSBuildExtensionsOutputPath>$(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Build.Extensions</MSBuildExtensionsOutputPath>
3333
<SdkMSBuildExtensionsSwrFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.swr</SdkMSBuildExtensionsSwrFile>

‎src/Installer/redist-installer/redist-installer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" />
2626
</ItemGroup>
2727

28-
<Import Project="targets\BuildCoreSdkTasks.targets" />
28+
<Import Project="$(RepoRoot)src\Tasks\sdk-tasks\sdk-tasks.InTree.targets" />
2929
<Import Project="targets\GetRuntimeInformation.targets" />
3030
<Import Project="targets\SetBuildDefaults.targets" />
3131
<Import Project="targets\Branding.targets" />

‎src/Installer/redist-installer/targets/BuildCoreSdkTasks.targets

-47
This file was deleted.

‎src/Installer/redist-installer/targets/BundledTemplates.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<CollatePackageDownloads Packages="@(BundledTemplates)">
4747
<Output TaskParameter="PackageDownloads" ItemName="BundledTemplatePackageDownload" />
4848
</CollatePackageDownloads>
49-
<!-- Create a separate project to for template PackageDownloads, as we want to use a task in core-sdk-tasks to collate them, but we
49+
<!-- Create a separate project to for template PackageDownloads, as we want to use a task in sdk-tasks to collate them, but we
5050
can't use those tasks before normal NuGet restore -->
5151
<PropertyGroup>
5252
<TemplatePackageDownloadProjectContent>

‎src/Layout/redist/redist.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);NETSDK1205</MSBuildWarningsAsMessages>
1818
</PropertyGroup>
1919

20-
<Import Project="targets\BuildToolsetTasks.targets" />
20+
<Import Project="$(RepoRoot)src\Tasks\sdk-tasks\sdk-tasks.InTree.targets" />
2121
<Import Project="targets\GetRuntimeInformation.targets" />
2222
<Import Project="targets\Version.targets" />
2323
<Import Project="targets\BundledSdks.targets" />

0 commit comments

Comments
 (0)