Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move msbuild tasks into src folder and delete dead code #45722

Merged
merged 7 commits into from
Dec 8, 2020
Merged

Move msbuild tasks into src folder and delete dead code #45722

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dd65525
Move tools-local\tasks to src\tasks
ViktorHofer Dec 7, 2020
1d99c48
Update paths to tasks
ViktorHofer Dec 7, 2020
7f0f90f
Delete dead task code
ViktorHofer Dec 7, 2020
d6c19d3
nit installer.tasks.csproj changes
ViktorHofer Dec 7, 2020
c59b1b4
Fix hardcoded paths...
ViktorHofer Dec 7, 2020
30665cb
Remove mobile.tasks intermediate folder
ViktorHofer Dec 8, 2020
1b74ca3
Update paths
ViktorHofer Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Configurations.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...crosoft.NET.Runtime.Android.Sample.Mono/Microsoft.NET.Runtime.Android.Sample.Mono.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />

<ItemGroup>
<ProjectReference Include="$(RepoToolsLocalDir)tasks\mobile.tasks\AndroidAppBuilder\AndroidAppBuilder.csproj" />
<ProjectReference Include="$(RepoTasksDir)mobile.tasks\AndroidAppBuilder\AndroidAppBuilder.csproj" />
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions ...nuget/Microsoft.NET.Runtime.iOS.Sample.Mono/Microsoft.NET.Runtime.iOS.Sample.Mono.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />

<ItemGroup>
<ProjectReference Include="$(RepoToolsLocalDir)tasks\mobile.tasks\AppleAppBuilder\AppleAppBuilder.csproj" />
<ProjectReference Include="$(RepoTasksDir)mobile.tasks\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)mobile.tasks\AppleAppBuilder\Templates\runtime.m" />
<_iOSSampleFiles Include="$(RepoTasksDir)mobile.tasks\AppleAppBuilder\Templates\runtime.h" />

<PackageFile Include="@(_iOSSampleFiles)" TargetPath="tools\$(NetCoreAppToolCurrent)\" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...get/Microsoft.NET.Runtime.wasm.Sample.Mono/Microsoft.NET.Runtime.wasm.Sample.Mono.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />

<ItemGroup>
<ProjectReference Include="$(RepoToolsLocalDir)tasks\mobile.tasks\WasmAppBuilder\WasmAppBuilder.csproj" />
<ProjectReference Include="$(RepoTasksDir)mobile.tasks\WasmAppBuilder\WasmAppBuilder.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/netcore/sample/iOS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ USE_LLVM=True

all: runtimepack run

TOOLS_DIR=../../../../../tools-local/tasks/mobile.tasks
TOOLS_DIR=../../../../tasks/mobile.tasks
appbuilder:
$(DOTNET) build -c Release $(TOOLS_DIR)/AotCompilerTask/MonoAOTCompiler.csproj
$(DOTNET) build -c Release $(TOOLS_DIR)/AppleAppBuilder/AppleAppBuilder.csproj
Expand Down
4 changes: 2 additions & 2 deletions src/mono/wasm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/mobile.tasks/WasmAppBuilder

build-tasks:
$(DOTNET) build $(TOP)/tools-local/tasks/mobile.tasks/WasmBuildTasks
$(DOTNET) build $(TOP)/src/tasks/mobile.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)
Expand Down
0 ...-local/tasks/installer.tasks/BuildTask.cs → src/tasks/installer.tasks/BuildTask.cs
View file
Open in desktop
File renamed without changes.
0 ....Publish/CloudTestTasks/AzureBlobLease.cs → ....Publish/CloudTestTasks/AzureBlobLease.cs
View file
Open in desktop
File renamed without changes.
0 ...stTasks/AzureConnectionStringBuildTask.cs → ...stTasks/AzureConnectionStringBuildTask.cs
View file
Open in desktop
File renamed without changes.
0 ...ols.Publish/CloudTestTasks/AzureHelper.cs → ...ols.Publish/CloudTestTasks/AzureHelper.cs
View file
Open in desktop
File renamed without changes.
0 ...ish/CloudTestTasks/CopyAzureBlobToBlob.cs → ...ish/CloudTestTasks/CopyAzureBlobToBlob.cs
View file
Open in desktop
File renamed without changes.
0 ...Publish/CloudTestTasks/DeleteAzureBlob.cs → ...Publish/CloudTestTasks/DeleteAzureBlob.cs
View file
Open in desktop
File renamed without changes.
0 ...blish/CloudTestTasks/DownloadFromAzure.cs → ...blish/CloudTestTasks/DownloadFromAzure.cs
View file
Open in desktop
File renamed without changes.
0 ....Publish/CloudTestTasks/ListAzureBlobs.cs → ....Publish/CloudTestTasks/ListAzureBlobs.cs
View file
Open in desktop
File renamed without changes.
0 ...loudTestTasks/PublishStringToAzureBlob.cs → ...loudTestTasks/PublishStringToAzureBlob.cs
View file
Open in desktop
File renamed without changes.
0 ...ls.Publish/CloudTestTasks/UploadClient.cs → ...ls.Publish/CloudTestTasks/UploadClient.cs
View file
Open in desktop
File renamed without changes.
0 ...s.Publish/CloudTestTasks/UploadToAzure.cs → ...s.Publish/CloudTestTasks/UploadToAzure.cs
View file
Open in desktop
File renamed without changes.
0 ...taller.tasks/BuildTools.Publish/README.md → ...taller.tasks/BuildTools.Publish/README.md
View file
Open in desktop
File renamed without changes.
0 ...dTools.Publish/Tasks/GenerateChecksums.cs → ...dTools.Publish/Tasks/GenerateChecksums.cs
View file
Open in desktop
File renamed without changes.
0 ...al/tasks/installer.tasks/FileUtilities.cs → src/tasks/installer.tasks/FileUtilities.cs
View file
Open in desktop
File renamed without changes.
0 ...al/tasks/installer.tasks/FinalizeBuild.cs → src/tasks/installer.tasks/FinalizeBuild.cs
View file
Open in desktop
File renamed without changes.
0 ...installer.tasks/GenerateCurrentVersion.cs → ...installer.tasks/GenerateCurrentVersion.cs
View file
Open in desktop
File renamed without changes.
0 ...staller.tasks/GenerateFileVersionProps.cs → ...staller.tasks/GenerateFileVersionProps.cs
View file
Open in desktop
File renamed without changes.
0 ...s/installer.tasks/GenerateGuidFromName.cs → ...s/installer.tasks/GenerateGuidFromName.cs
View file
Open in desktop
File renamed without changes.
0 ...sks/installer.tasks/GenerateMsiVersion.cs → ...sks/installer.tasks/GenerateMsiVersion.cs
View file
Open in desktop
File renamed without changes.
0 ...asks/installer.tasks/GenerateRunScript.cs → ...asks/installer.tasks/GenerateRunScript.cs
View file
Open in desktop
File renamed without changes.
0 ...ks/GenerateTestSharedFrameworkDepsFile.cs → ...ks/GenerateTestSharedFrameworkDepsFile.cs
View file
Open in desktop
File renamed without changes.
0 ...nstaller.tasks/RegenerateDownloadTable.cs → ...nstaller.tasks/RegenerateDownloadTable.cs
View file
Open in desktop
File renamed without changes.
37 changes: 37 additions & 0 deletions src/tasks/installer.tasks/installer.tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
0 ...dAppBuilder/AndroidApkFileReplacerTask.cs → ...dAppBuilder/AndroidApkFileReplacerTask.cs
View file
Open in desktop
File renamed without changes.
0 ...ks/AndroidAppBuilder/AndroidAppBuilder.cs → ...ks/AndroidAppBuilder/AndroidAppBuilder.cs
View file
Open in desktop
File renamed without changes.
0 ...ndroidAppBuilder/AndroidAppBuilder.csproj → ...ndroidAppBuilder/AndroidAppBuilder.csproj
View file
Open in desktop
File renamed without changes.
0 ...ile.tasks/AndroidAppBuilder/ApkBuilder.cs → ...ile.tasks/AndroidAppBuilder/ApkBuilder.cs
View file
Open in desktop
File renamed without changes.
0 ...dAppBuilder/Templates/AndroidManifest.xml → ...dAppBuilder/Templates/AndroidManifest.xml
View file
Open in desktop
File renamed without changes.
0 ...pBuilder/Templates/CMakeLists-android.txt → ...pBuilder/Templates/CMakeLists-android.txt
View file
Open in desktop
File renamed without changes.
0 ...oidAppBuilder/Templates/MainActivity.java → ...oidAppBuilder/Templates/MainActivity.java
View file
Open in desktop
File renamed without changes.
0 ...droidAppBuilder/Templates/MonoRunner.java → ...droidAppBuilder/Templates/MonoRunner.java
View file
Open in desktop
File renamed without changes.
0 ...s/AndroidAppBuilder/Templates/monodroid.c → ...s/AndroidAppBuilder/Templates/monodroid.c
View file
Open in desktop
File renamed without changes.
0 ...s/mobile.tasks/AndroidAppBuilder/Utils.cs → ...s/mobile.tasks/AndroidAppBuilder/Utils.cs
View file
Open in desktop
File renamed without changes.
0 ....tasks/AotCompilerTask/MonoAOTCompiler.cs → ....tasks/AotCompilerTask/MonoAOTCompiler.cs
View file
Open in desktop
File renamed without changes.
0 ...ks/AotCompilerTask/MonoAOTCompiler.csproj → ...ks/AotCompilerTask/MonoAOTCompiler.csproj
View file
Open in desktop
File renamed without changes.
0 ...sks/AotCompilerTask/MonoAOTCompiler.props → ...sks/AotCompilerTask/MonoAOTCompiler.props
View file
Open in desktop
File renamed without changes.
0 ...sks/mobile.tasks/AotCompilerTask/Utils.cs → ...sks/mobile.tasks/AotCompilerTask/Utils.cs
View file
Open in desktop
File renamed without changes.
0 ....tasks/AppleAppBuilder/AppleAppBuilder.cs → ....tasks/AppleAppBuilder/AppleAppBuilder.cs
View file
Open in desktop
File renamed without changes.
0 ...ks/AppleAppBuilder/AppleAppBuilder.csproj → ...ks/AppleAppBuilder/AppleAppBuilder.csproj
View file
Open in desktop
File renamed without changes.
0 ...Builder/Templates/CMakeLists.txt.template → ...Builder/Templates/CMakeLists.txt.template
View file
Open in desktop
File renamed without changes.
0 ...eAppBuilder/Templates/Info.plist.template → ...eAppBuilder/Templates/Info.plist.template
View file
Open in desktop
File renamed without changes.
0 .../AppleAppBuilder/Templates/main-console.m → .../AppleAppBuilder/Templates/main-console.m
View file
Open in desktop
File renamed without changes.
0 ...s/AppleAppBuilder/Templates/main-simple.m → ...s/AppleAppBuilder/Templates/main-simple.m
View file
Open in desktop
File renamed without changes.
0 ...tasks/AppleAppBuilder/Templates/runtime.h → ...tasks/AppleAppBuilder/Templates/runtime.h
View file
Open in desktop
File renamed without changes.
0 ...tasks/AppleAppBuilder/Templates/runtime.m → ...tasks/AppleAppBuilder/Templates/runtime.m
View file
Open in desktop
File renamed without changes.
0 ...sks/mobile.tasks/AppleAppBuilder/Utils.cs → ...sks/mobile.tasks/AppleAppBuilder/Utils.cs
View file
Open in desktop
File renamed without changes.
0 ...sks/mobile.tasks/AppleAppBuilder/Xcode.cs → ...sks/mobile.tasks/AppleAppBuilder/Xcode.cs
View file
Open in desktop
File renamed without changes.
0 ...s/WasmAppBuilder/PInvokeTableGenerator.cs → ...s/WasmAppBuilder/PInvokeTableGenerator.cs
View file
Open in desktop
File renamed without changes.
0 ...le.tasks/WasmAppBuilder/WasmAppBuilder.cs → ...le.tasks/WasmAppBuilder/WasmAppBuilder.cs
View file
Open in desktop
File renamed without changes.
0 ...asks/WasmAppBuilder/WasmAppBuilder.csproj → ...asks/WasmAppBuilder/WasmAppBuilder.csproj
View file
Open in desktop
File renamed without changes.
0 ...asks/WasmBuildTasks/GenerateWasmBundle.cs → ...asks/WasmBuildTasks/GenerateWasmBundle.cs
View file
Open in desktop
File renamed without changes.
0 ...asks/WasmBuildTasks/WasmBuildTasks.csproj → ...asks/WasmBuildTasks/WasmBuildTasks.csproj
View file
Open in desktop
File renamed without changes.
0 tools-local/tasks/tasks.proj → src/tasks/tasks.proj
View file
Open in desktop
File renamed without changes.
Loading