dotnet · ViktorHofer · Dec 8, 2020 · Dec 7, 2020 · Dec 7, 2020 · Dec 7, 2020
diff --git a/eng/Configurations.props b/eng/Configurations.props
@@ -15,7 +15,7 @@
     <MonoProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono'))</MonoProjectRoot>
     <InstallerProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'installer'))</InstallerProjectRoot>
     <RepoToolsLocalDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'tools-local'))</RepoToolsLocalDir>
-    <RepoTasksDir>$([MSBuild]::NormalizeDirectory('$(RepoToolsLocalDir)', 'tasks'))</RepoTasksDir>
+    <RepoTasksDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'tasks'))</RepoTasksDir>
     <IbcOptimizationDataDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc'))</IbcOptimizationDataDir>
     <XmlDocDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'docs'))</XmlDocDir>
   </PropertyGroup>

diff --git a/src/mono/Directory.Build.props b/src/mono/Directory.Build.props
@@ -86,10 +86,10 @@
 
   <!-- Paths for Mobile App Projects  -->
   <PropertyGroup>
-    <AppleAppBuilderProjDirectory>$([MSBuild]::NormalizeDirectory('$(RepoTasksDir)', 'mobile.tasks', 'AppleAppBuilder'))</AppleAppBuilderProjDirectory>
+    <AppleAppBuilderProjDirectory>$([MSBuild]::NormalizeDirectory('$(RepoTasksDir)', 'AppleAppBuilder'))</AppleAppBuilderProjDirectory>
     <AppleTestRunnerProjDirectory>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'Common', tests, 'AppleTestRunner'))</AppleTestRunnerProjDirectory>
-    <AndroidAppBuilderProjDirectory>$([MSBuild]::NormalizeDirectory('$(RepoTasksDir)', 'mobile.tasks', 'AndroidAppBuilder'))</AndroidAppBuilderProjDirectory>
+    <AndroidAppBuilderProjDirectory>$([MSBuild]::NormalizeDirectory('$(RepoTasksDir)', 'AndroidAppBuilder'))</AndroidAppBuilderProjDirectory>
     <AndroidTestRunnerProjDirectory>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'Common', tests, 'AndroidTestRunner'))</AndroidTestRunnerProjDirectory>
-    <MonoAOTCompilerProjDirectory>$([MSBuild]::NormalizeDirectory('$(RepoTasksDir)', 'mobile.tasks', 'AotCompilerTask'))</MonoAOTCompilerProjDirectory>
+    <MonoAOTCompilerProjDirectory>$([MSBuild]::NormalizeDirectory('$(RepoTasksDir)', 'AotCompilerTask'))</MonoAOTCompilerProjDirectory>
   </PropertyGroup>
 </Project>
diff --git a/...crosoft.NET.Runtime.Android.Sample.Mono/Microsoft.NET.Runtime.Android.Sample.Mono.pkgproj b/...crosoft.NET.Runtime.Android.Sample.Mono/Microsoft.NET.Runtime.Android.Sample.Mono.pkgproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoToolsLocalDir)tasks\mobile.tasks\AndroidAppBuilder\AndroidAppBuilder.csproj" />
+    <ProjectReference Include="$(RepoTasksDir)AndroidAppBuilder\AndroidAppBuilder.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...nuget/Microsoft.NET.Runtime.iOS.Sample.Mono/Microsoft.NET.Runtime.iOS.Sample.Mono.pkgproj b/...nuget/Microsoft.NET.Runtime.iOS.Sample.Mono/Microsoft.NET.Runtime.iOS.Sample.Mono.pkgproj
@@ -3,13 +3,13 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoToolsLocalDir)tasks\mobile.tasks\AppleAppBuilder\AppleAppBuilder.csproj" />
+    <ProjectReference Include="$(RepoTasksDir)AppleAppBuilder\AppleAppBuilder.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <_iOSSampleFiles Include="$(ArtifactsDir)bin\AppleAppBuilder\$(Configuration)\$(NetCoreAppToolCurrent)\AppleAppBuilder.dll" />
-    <_iOSSampleFiles Include="$(RepoToolsLocalDir)tasks\mobile.tasks\AppleAppBuilder\Templates\runtime.m" />
-    <_iOSSampleFiles Include="$(RepoToolsLocalDir)tasks\mobile.tasks\AppleAppBuilder\Templates\runtime.h" />
+    <_iOSSampleFiles Include="$(RepoTasksDir)AppleAppBuilder\Templates\runtime.m" />
+    <_iOSSampleFiles Include="$(RepoTasksDir)AppleAppBuilder\Templates\runtime.h" />
 
     <PackageFile Include="@(_iOSSampleFiles)" TargetPath="tools\$(NetCoreAppToolCurrent)\" />
   </ItemGroup>

diff --git a/...get/Microsoft.NET.Runtime.wasm.Sample.Mono/Microsoft.NET.Runtime.wasm.Sample.Mono.pkgproj b/...get/Microsoft.NET.Runtime.wasm.Sample.Mono/Microsoft.NET.Runtime.wasm.Sample.Mono.pkgproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoToolsLocalDir)tasks\mobile.tasks\WasmAppBuilder\WasmAppBuilder.csproj" />
+    <ProjectReference Include="$(RepoTasksDir)WasmAppBuilder\WasmAppBuilder.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/mono/netcore/sample/iOS/Makefile b/src/mono/netcore/sample/iOS/Makefile
@@ -5,7 +5,7 @@ USE_LLVM=True
 
 all: runtimepack run
 
-TOOLS_DIR=../../../../../tools-local/tasks/mobile.tasks
+TOOLS_DIR=../../../../tasks
 appbuilder:
 	$(DOTNET) build -c Release $(TOOLS_DIR)/AotCompilerTask/MonoAOTCompiler.csproj
 	$(DOTNET) build -c Release $(TOOLS_DIR)/AppleAppBuilder/AppleAppBuilder.csproj

diff --git a/src/mono/netcore/sample/iOS/Program.csproj b/src/mono/netcore/sample/iOS/Program.csproj
@@ -22,7 +22,7 @@
     <Message Text="Packaged ID: %(RuntimePack.PackageDirectory)" Importance="high" />
   </Target>
 
-  <Import Project="$(RepoTasksDir)mobile.tasks\AotCompilerTask\MonoAOTCompiler.props" />
+  <Import Project="$(RepoTasksDir)AotCompilerTask\MonoAOTCompiler.props" />
   <UsingTask TaskName="AppleAppBuilderTask"
              AssemblyFile="$(ArtifactsBinDir)AppleAppBuilder\$(Configuration)\$(NetCoreAppToolCurrent)\AppleAppBuilder.dll" />
 

diff --git a/src/mono/netcore/sample/wasm/browser/WasmSample.csproj b/src/mono/netcore/sample/wasm/browser/WasmSample.csproj
@@ -13,7 +13,7 @@
 
   <Target Name="RebuildWasmAppBuilder">
     <ItemGroup>
-      <WasmAppBuildProject Include="$(RepoTasksDir)mobile.tasks\WasmAppBuilder\WasmAppBuilder.csproj" />
+      <WasmAppBuildProject Include="$(RepoTasksDir)WasmAppBuilder\WasmAppBuilder.csproj" />
     </ItemGroup>
 
     <MSBuild Projects="@(WasmAppBuildProject)"

diff --git a/src/mono/netcore/sample/wasm/console/WasmSample.csproj b/src/mono/netcore/sample/wasm/console/WasmSample.csproj
@@ -39,7 +39,7 @@
 
   <Target Name="RebuildWasmAppBuilder">
     <ItemGroup>
-      <WasmAppBuildProject Include="$(RepoTasksDir)mobile.tasks\WasmAppBuilder\WasmAppBuilder.csproj" />
+      <WasmAppBuildProject Include="$(RepoTasksDir)WasmAppBuilder\WasmAppBuilder.csproj" />
     </ItemGroup>
 
     <MSBuild Projects="@(WasmAppBuildProject)"
@@ -51,7 +51,7 @@
              Targets="Build;Publish"/>
   </Target>
 
-  <Import Project="$(RepoTasksDir)mobile.tasks\AotCompilerTask\MonoAOTCompiler.props" />
+  <Import Project="$(RepoTasksDir)AotCompilerTask\MonoAOTCompiler.props" />
   <UsingTask TaskName="WasmAppBuilder" 
              AssemblyFile="$(ArtifactsBinDir)WasmAppBuilder\Debug\$(NetCoreAppToolCurrent)\publish\WasmAppBuilder.dll"/>
 

diff --git a/src/mono/wasm/Makefile b/src/mono/wasm/Makefile
@@ -158,10 +158,10 @@ test-runner:
 	$(DOTNET) build $(TOP)/src/libraries/Common/tests/WasmTestRunner /p:Configuration=$(CONFIG)
 
 app-builder:
-	$(DOTNET) build $(TOP)/tools-local/tasks/mobile.tasks/WasmAppBuilder
+	$(DOTNET) build $(TOP)/src/tasks/WasmAppBuilder
 
 build-tasks:
-	$(DOTNET) build $(TOP)/tools-local/tasks/mobile.tasks/WasmBuildTasks
+	$(DOTNET) build $(TOP)/src/tasks/WasmBuildTasks
 
 run-tests-v8-%:
 	PATH="$(JSVU):$(PATH)" $(DOTNET) build $(TOP)/src/libraries/$*/tests/ /t:Test /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=$(CONFIG) /p:JSEngine=V8 $(MSBUILD_ARGS)

diff --git a/src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj b/src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj
@@ -20,7 +20,7 @@
 
   <Target Name="RebuildWasmAppBuilder">
     <ItemGroup>
-      <WasmAppBuildProject Include="$(RepoTasksDir)mobile.tasks\WasmAppBuilder\WasmAppBuilder.csproj" />
+      <WasmAppBuildProject Include="$(RepoTasksDir)WasmAppBuilder\WasmAppBuilder.csproj" />
     </ItemGroup>
 
     <MSBuild Projects="@(WasmAppBuildProject)"

diff --git a/...dAppBuilder/AndroidApkFileReplacerTask.cs → ...dAppBuilder/AndroidApkFileReplacerTask.cs b/...dAppBuilder/AndroidApkFileReplacerTask.cs → ...dAppBuilder/AndroidApkFileReplacerTask.cs
diff --git a/...ks/AndroidAppBuilder/AndroidAppBuilder.cs → ...ks/AndroidAppBuilder/AndroidAppBuilder.cs b/...ks/AndroidAppBuilder/AndroidAppBuilder.cs → ...ks/AndroidAppBuilder/AndroidAppBuilder.cs
diff --git a/...ndroidAppBuilder/AndroidAppBuilder.csproj → ...ndroidAppBuilder/AndroidAppBuilder.csproj b/...ndroidAppBuilder/AndroidAppBuilder.csproj → ...ndroidAppBuilder/AndroidAppBuilder.csproj
diff --git a/...ile.tasks/AndroidAppBuilder/ApkBuilder.cs → src/tasks/AndroidAppBuilder/ApkBuilder.cs b/...ile.tasks/AndroidAppBuilder/ApkBuilder.cs → src/tasks/AndroidAppBuilder/ApkBuilder.cs
diff --git a/...dAppBuilder/Templates/AndroidManifest.xml → ...dAppBuilder/Templates/AndroidManifest.xml b/...dAppBuilder/Templates/AndroidManifest.xml → ...dAppBuilder/Templates/AndroidManifest.xml
diff --git a/...pBuilder/Templates/CMakeLists-android.txt → ...pBuilder/Templates/CMakeLists-android.txt b/...pBuilder/Templates/CMakeLists-android.txt → ...pBuilder/Templates/CMakeLists-android.txt
diff --git a/...oidAppBuilder/Templates/MainActivity.java → ...oidAppBuilder/Templates/MainActivity.java b/...oidAppBuilder/Templates/MainActivity.java → ...oidAppBuilder/Templates/MainActivity.java
diff --git a/...droidAppBuilder/Templates/MonoRunner.java → ...droidAppBuilder/Templates/MonoRunner.java b/...droidAppBuilder/Templates/MonoRunner.java → ...droidAppBuilder/Templates/MonoRunner.java
diff --git a/...s/AndroidAppBuilder/Templates/monodroid.c → ...s/AndroidAppBuilder/Templates/monodroid.c b/...s/AndroidAppBuilder/Templates/monodroid.c → ...s/AndroidAppBuilder/Templates/monodroid.c
diff --git a/...s/mobile.tasks/AndroidAppBuilder/Utils.cs → src/tasks/AndroidAppBuilder/Utils.cs b/...s/mobile.tasks/AndroidAppBuilder/Utils.cs → src/tasks/AndroidAppBuilder/Utils.cs
diff --git a/....tasks/AotCompilerTask/MonoAOTCompiler.cs → src/tasks/AotCompilerTask/MonoAOTCompiler.cs b/....tasks/AotCompilerTask/MonoAOTCompiler.cs → src/tasks/AotCompilerTask/MonoAOTCompiler.cs
diff --git a/...ks/AotCompilerTask/MonoAOTCompiler.csproj → ...ks/AotCompilerTask/MonoAOTCompiler.csproj b/...ks/AotCompilerTask/MonoAOTCompiler.csproj → ...ks/AotCompilerTask/MonoAOTCompiler.csproj
diff --git a/...sks/AotCompilerTask/MonoAOTCompiler.props → ...sks/AotCompilerTask/MonoAOTCompiler.props b/...sks/AotCompilerTask/MonoAOTCompiler.props → ...sks/AotCompilerTask/MonoAOTCompiler.props
diff --git a/...sks/mobile.tasks/AotCompilerTask/Utils.cs → src/tasks/AotCompilerTask/Utils.cs b/...sks/mobile.tasks/AotCompilerTask/Utils.cs → src/tasks/AotCompilerTask/Utils.cs
diff --git a/....tasks/AppleAppBuilder/AppleAppBuilder.cs → src/tasks/AppleAppBuilder/AppleAppBuilder.cs b/....tasks/AppleAppBuilder/AppleAppBuilder.cs → src/tasks/AppleAppBuilder/AppleAppBuilder.cs
diff --git a/...ks/AppleAppBuilder/AppleAppBuilder.csproj → ...ks/AppleAppBuilder/AppleAppBuilder.csproj b/...ks/AppleAppBuilder/AppleAppBuilder.csproj → ...ks/AppleAppBuilder/AppleAppBuilder.csproj
diff --git a/...Builder/Templates/CMakeLists.txt.template → ...Builder/Templates/CMakeLists.txt.template b/...Builder/Templates/CMakeLists.txt.template → ...Builder/Templates/CMakeLists.txt.template
diff --git a/...eAppBuilder/Templates/Info.plist.template → ...eAppBuilder/Templates/Info.plist.template b/...eAppBuilder/Templates/Info.plist.template → ...eAppBuilder/Templates/Info.plist.template
diff --git a/.../AppleAppBuilder/Templates/main-console.m → .../AppleAppBuilder/Templates/main-console.m b/.../AppleAppBuilder/Templates/main-console.m → .../AppleAppBuilder/Templates/main-console.m
diff --git a/...s/AppleAppBuilder/Templates/main-simple.m → ...s/AppleAppBuilder/Templates/main-simple.m b/...s/AppleAppBuilder/Templates/main-simple.m → ...s/AppleAppBuilder/Templates/main-simple.m
diff --git a/...tasks/AppleAppBuilder/Templates/runtime.h → ...tasks/AppleAppBuilder/Templates/runtime.h b/...tasks/AppleAppBuilder/Templates/runtime.h → ...tasks/AppleAppBuilder/Templates/runtime.h
diff --git a/...tasks/AppleAppBuilder/Templates/runtime.m → ...tasks/AppleAppBuilder/Templates/runtime.m b/...tasks/AppleAppBuilder/Templates/runtime.m → ...tasks/AppleAppBuilder/Templates/runtime.m
diff --git a/...sks/mobile.tasks/AppleAppBuilder/Utils.cs → src/tasks/AppleAppBuilder/Utils.cs b/...sks/mobile.tasks/AppleAppBuilder/Utils.cs → src/tasks/AppleAppBuilder/Utils.cs
diff --git a/...sks/mobile.tasks/AppleAppBuilder/Xcode.cs → src/tasks/AppleAppBuilder/Xcode.cs b/...sks/mobile.tasks/AppleAppBuilder/Xcode.cs → src/tasks/AppleAppBuilder/Xcode.cs
diff --git a/...s/WasmAppBuilder/PInvokeTableGenerator.cs → ...s/WasmAppBuilder/PInvokeTableGenerator.cs b/...s/WasmAppBuilder/PInvokeTableGenerator.cs → ...s/WasmAppBuilder/PInvokeTableGenerator.cs
diff --git a/...le.tasks/WasmAppBuilder/WasmAppBuilder.cs → src/tasks/WasmAppBuilder/WasmAppBuilder.cs b/...le.tasks/WasmAppBuilder/WasmAppBuilder.cs → src/tasks/WasmAppBuilder/WasmAppBuilder.cs
diff --git a/...asks/WasmAppBuilder/WasmAppBuilder.csproj → ...asks/WasmAppBuilder/WasmAppBuilder.csproj b/...asks/WasmAppBuilder/WasmAppBuilder.csproj → ...asks/WasmAppBuilder/WasmAppBuilder.csproj
diff --git a/...asks/WasmBuildTasks/GenerateWasmBundle.cs → ...asks/WasmBuildTasks/GenerateWasmBundle.cs b/...asks/WasmBuildTasks/GenerateWasmBundle.cs → ...asks/WasmBuildTasks/GenerateWasmBundle.cs
diff --git a/...asks/WasmBuildTasks/WasmBuildTasks.csproj → ...asks/WasmBuildTasks/WasmBuildTasks.csproj b/...asks/WasmBuildTasks/WasmBuildTasks.csproj → ...asks/WasmBuildTasks/WasmBuildTasks.csproj
diff --git a/...-local/tasks/installer.tasks/BuildTask.cs → src/tasks/installer.tasks/BuildTask.cs b/...-local/tasks/installer.tasks/BuildTask.cs → src/tasks/installer.tasks/BuildTask.cs
diff --git a/....Publish/CloudTestTasks/AzureBlobLease.cs → ....Publish/CloudTestTasks/AzureBlobLease.cs b/....Publish/CloudTestTasks/AzureBlobLease.cs → ....Publish/CloudTestTasks/AzureBlobLease.cs
diff --git a/...stTasks/AzureConnectionStringBuildTask.cs → ...stTasks/AzureConnectionStringBuildTask.cs b/...stTasks/AzureConnectionStringBuildTask.cs → ...stTasks/AzureConnectionStringBuildTask.cs
diff --git a/...ols.Publish/CloudTestTasks/AzureHelper.cs → ...ols.Publish/CloudTestTasks/AzureHelper.cs b/...ols.Publish/CloudTestTasks/AzureHelper.cs → ...ols.Publish/CloudTestTasks/AzureHelper.cs
diff --git a/...ish/CloudTestTasks/CopyAzureBlobToBlob.cs → ...ish/CloudTestTasks/CopyAzureBlobToBlob.cs b/...ish/CloudTestTasks/CopyAzureBlobToBlob.cs → ...ish/CloudTestTasks/CopyAzureBlobToBlob.cs
diff --git a/...Publish/CloudTestTasks/DeleteAzureBlob.cs → ...Publish/CloudTestTasks/DeleteAzureBlob.cs b/...Publish/CloudTestTasks/DeleteAzureBlob.cs → ...Publish/CloudTestTasks/DeleteAzureBlob.cs
diff --git a/...blish/CloudTestTasks/DownloadFromAzure.cs → ...blish/CloudTestTasks/DownloadFromAzure.cs b/...blish/CloudTestTasks/DownloadFromAzure.cs → ...blish/CloudTestTasks/DownloadFromAzure.cs
diff --git a/....Publish/CloudTestTasks/ListAzureBlobs.cs → ....Publish/CloudTestTasks/ListAzureBlobs.cs b/....Publish/CloudTestTasks/ListAzureBlobs.cs → ....Publish/CloudTestTasks/ListAzureBlobs.cs
diff --git a/...loudTestTasks/PublishStringToAzureBlob.cs → ...loudTestTasks/PublishStringToAzureBlob.cs b/...loudTestTasks/PublishStringToAzureBlob.cs → ...loudTestTasks/PublishStringToAzureBlob.cs
diff --git a/...ls.Publish/CloudTestTasks/UploadClient.cs → ...ls.Publish/CloudTestTasks/UploadClient.cs b/...ls.Publish/CloudTestTasks/UploadClient.cs → ...ls.Publish/CloudTestTasks/UploadClient.cs
diff --git a/...s.Publish/CloudTestTasks/UploadToAzure.cs → ...s.Publish/CloudTestTasks/UploadToAzure.cs b/...s.Publish/CloudTestTasks/UploadToAzure.cs → ...s.Publish/CloudTestTasks/UploadToAzure.cs
diff --git a/...taller.tasks/BuildTools.Publish/README.md → ...taller.tasks/BuildTools.Publish/README.md b/...taller.tasks/BuildTools.Publish/README.md → ...taller.tasks/BuildTools.Publish/README.md
diff --git a/...dTools.Publish/Tasks/GenerateChecksums.cs → ...dTools.Publish/Tasks/GenerateChecksums.cs b/...dTools.Publish/Tasks/GenerateChecksums.cs → ...dTools.Publish/Tasks/GenerateChecksums.cs
diff --git a/...al/tasks/installer.tasks/FileUtilities.cs → src/tasks/installer.tasks/FileUtilities.cs b/...al/tasks/installer.tasks/FileUtilities.cs → src/tasks/installer.tasks/FileUtilities.cs
diff --git a/...al/tasks/installer.tasks/FinalizeBuild.cs → src/tasks/installer.tasks/FinalizeBuild.cs b/...al/tasks/installer.tasks/FinalizeBuild.cs → src/tasks/installer.tasks/FinalizeBuild.cs
diff --git a/...installer.tasks/GenerateCurrentVersion.cs → ...installer.tasks/GenerateCurrentVersion.cs b/...installer.tasks/GenerateCurrentVersion.cs → ...installer.tasks/GenerateCurrentVersion.cs
diff --git a/...staller.tasks/GenerateFileVersionProps.cs → ...staller.tasks/GenerateFileVersionProps.cs b/...staller.tasks/GenerateFileVersionProps.cs → ...staller.tasks/GenerateFileVersionProps.cs
diff --git a/...s/installer.tasks/GenerateGuidFromName.cs → ...s/installer.tasks/GenerateGuidFromName.cs b/...s/installer.tasks/GenerateGuidFromName.cs → ...s/installer.tasks/GenerateGuidFromName.cs
diff --git a/...sks/installer.tasks/GenerateMsiVersion.cs → ...sks/installer.tasks/GenerateMsiVersion.cs b/...sks/installer.tasks/GenerateMsiVersion.cs → ...sks/installer.tasks/GenerateMsiVersion.cs
diff --git a/...asks/installer.tasks/GenerateRunScript.cs → ...asks/installer.tasks/GenerateRunScript.cs b/...asks/installer.tasks/GenerateRunScript.cs → ...asks/installer.tasks/GenerateRunScript.cs
diff --git a/...ks/GenerateTestSharedFrameworkDepsFile.cs → ...ks/GenerateTestSharedFrameworkDepsFile.cs b/...ks/GenerateTestSharedFrameworkDepsFile.cs → ...ks/GenerateTestSharedFrameworkDepsFile.cs
diff --git a/...nstaller.tasks/RegenerateDownloadTable.cs → ...nstaller.tasks/RegenerateDownloadTable.cs b/...nstaller.tasks/RegenerateDownloadTable.cs → ...nstaller.tasks/RegenerateDownloadTable.cs
diff --git a/src/tasks/installer.tasks/installer.tasks.csproj b/src/tasks/installer.tasks/installer.tasks.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <IsShipping>false</IsShipping>
+    <RunAnalyzers>false</RunAnalyzers>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="*.cs" />
+    <Compile Include="BuildTools.Publish\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
+    <PackageReference Include="NuGet.ProjectModel" Version="$(RefOnlyNugetProjectModelVersion)" />
+    <PackageReference Include="NuGet.Packaging" Version="$(RefOnlyNugetPackagingVersion)" />
+    <PackageReference Include="System.Reflection.Metadata" Version="1.7.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.Build" Version="$(RefOnlyMicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion)" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(RefOnlyMicrosoftBuildTasksCoreVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(RefOnlyMicrosoftBuildUtilitiesCoreVersion)" />
+    <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.0.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+    <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="Microsoft.Build.Tasks.v4.0" />
+    <Reference Include="Microsoft.Build.Utilities.v4.0" />
+    <Reference Include="Microsoft.Build" />
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.IO.Compression" />
+  </ItemGroup>
+</Project>
diff --git a/tools-local/tasks/tasks.proj → src/tasks/tasks.proj b/tools-local/tasks/tasks.proj → src/tasks/tasks.proj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
     <ProjectReference Include="$(MSBuildThisFileDirectory)**\*.csproj" />
-    <ProjectReference Remove="$(MSBuildThisFileDirectory)mobile.tasks\AndroidAppBuilder\AndroidAppBuilder.csproj"
+    <ProjectReference Remove="$(MSBuildThisFileDirectory)AndroidAppBuilder\AndroidAppBuilder.csproj"
                       Condition="'$(TargetOS)' != 'Android'" />
-    <ProjectReference Remove="$(MSBuildThisFileDirectory)mobile.tasks\AppleAppBuilder\AppleAppBuilder.csproj"
+    <ProjectReference Remove="$(MSBuildThisFileDirectory)AppleAppBuilder\AppleAppBuilder.csproj"
                       Condition="'$(TargetOS)' != 'iOS' and '$(TargetOS)' != 'tvOS'" />
-    <ProjectReference Remove="$(MSBuildThisFileDirectory)mobile.tasks\WasmAppBuilder\WasmAppBuilder.csproj"
+    <ProjectReference Remove="$(MSBuildThisFileDirectoryWasmAppBuilder\WasmAppBuilder.csproj"
                       Condition="'$(TargetOS)' != 'Browser'" />
-    <ProjectReference Remove="$(MSBuildThisFileDirectory)mobile.tasks\WasmBuildTasks\WasmBuildTasks.csproj"
+    <ProjectReference Remove="$(MSBuildThisFileDirectory)WasmBuildTasks\WasmBuildTasks.csproj"
                       Condition="'$(TargetOS)' != 'Browser'" />
-    <ProjectReference Remove="$(MSBuildThisFileDirectory)mobile.tasks\AotCompilerTask\MonoAOTCompiler.csproj"
+    <ProjectReference Remove="$(MSBuildThisFileDirectory)AotCompilerTask\MonoAOTCompiler.csproj"
                       Condition="'$(TargetsMobile)' != 'true'" />
   </ItemGroup>