Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit 82f04ad

Browse files
RedthRedth
committed
Cleaned up old migrated buildtasks
1 parent 6f20122 commit 82f04ad

File tree

18 files changed

+174
-347
lines changed

18 files changed

+174
-347
lines changed

‎config.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"slnFile" : "generated/AndroidX.sln",
44
"additionalProjects":
55
[
6-
"source/buildtasks/support-annotations/Support-Annotations-BuildTasks.csproj",
7-
"source/buildtasks/support-annotations-tests/Support-Annotations-BuildTasks-Tests.csproj",
8-
"source/buildtasks/support-vector-drawable/Support-Vector-Drawable-BuildTasks.csproj"
6+
"source/buildtasks/annotation/Annotation-BuildTasks.csproj",
7+
"source/buildtasks/annotation-tests/Annotation-BuildTasks-Tests.csproj",
8+
"source/buildtasks/vectordrawable/VectorDrawable-BuildTasks.csproj"
99
],
1010
"templates" : [
1111
{

‎source/AndroidXProject.cshtml‎

Lines changed: 10 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
<PropertyGroup>
2222
<PackageId>@(Model.NuGetPackageId)</PackageId>
23-
<Title>Xamarin AndroidX Library - @(Model.Name)</Title>
24-
<Summary>Xamarin.AndroidX bindings for AndroidX Library - @(Model.Name)</Summary>
25-
<Description>Xamarin.AndroidX bindings for AndroidX Library - @(Model.Name)</Description>
26-
<PackageTags>Xamarin AndroidX Xamarin.AndroidX Library</PackageTags>
23+
<Title>Xamarin AndroidX - @(Model.Name)</Title>
24+
<Summary>Xamarin.Android bindings for AndroidX - @(Model.Name)</Summary>
25+
<Description>Xamarin.Android bindings for AndroidX - @(Model.Name)</Description>
26+
<PackageTags>Xamarin AndroidX Xamarin.AndroidX Support Google @(Model.Name)</PackageTags>
2727
<Authors>Microsoft</Authors>
2828
<Owners>Microsoft</Owners>
2929
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
@@ -128,7 +128,7 @@
128128
}
129129
}
130130
<!-- some additional fixes -->
131-
@if (@Model.NuGetPackageId == "Xamarin.AndroidX.Transition.Transition")
131+
@if (@Model.NuGetPackageId == "Xamarin.AndroidX.Transition")
132132
{
133133
<ProjectReference Include="..\androidx.fragment.fragment\androidx.fragment.fragment.csproj" PrivateAssets="none" />
134134
}
@@ -144,55 +144,21 @@
144144
}
145145
</ItemGroup>
146146

147-
@if (@Model.NuGetPackageId == "Xamarin.AndroidX.Annotation.Annotation")
147+
@if (1==2 && @Model.NuGetPackageId == "Xamarin.AndroidX.Annotation")
148148
{
149+
// Disabled as this build task doesn't really do anything anymore but we may use it again in the future
149150
<ItemGroup>
150-
<None Include="..\..\source\buildtasks\support-annotations\bin\$(Configuration)\Xamarin.Android.Support.BuildTasks.dll" Pack="True" PackagePath="build\$(TargetFramework)" />
151+
<None Include="..\..\source\buildtasks\annotation\bin\$(Configuration)\Xamarin.AndroidX.Annotation.BuildTasks.dll" Pack="True" PackagePath="build\$(TargetFramework)" />
151152
</ItemGroup>
152153
}
153154

154-
@if (@Model.NuGetPackageId == "Xamarin.AndroidX.VectorDrawable.VectorDrawable")
155+
@if (@Model.NuGetPackageId == "Xamarin.AndroidX.VectorDrawable")
155156
{
156157
<ItemGroup>
157-
<None Include="..\..\source\buildtasks\support-vector-drawable\bin\$(Configuration)\Xamarin.Android.Support.Tasks.VectorDrawable.dll" Pack="True" PackagePath="build\$(TargetFramework)" />
158+
<None Include="..\..\source\buildtasks\vectordrawable\bin\$(Configuration)\Xamarin.AndroidX.VectorDrawable.BuildTasks.dll" Pack="True" PackagePath="build\$(TargetFramework)" />
158159
</ItemGroup>
159160
}
160161

161-
@if (@Model.NuGetPackageId == "Xamarin.Android.Support.v4")
162-
{
163-
<Target Name="AndroidSupportLibrariesTypeForwardersGenerationWithGenAPI">
164-
<Message Text="AndroidSupportLibrariesTypeForwardersGenerationWithGenAPI" ></Message>
165-
<PropertyGroup>
166-
<GenAPIPath>$(MSBuildProjectDirectory)/../../tools/microsoft.dotnet.buildtools.genapi.1.0.0-beta-00081/Microsoft.DotNet.BuildTools.GenAPI/tools/GenAPI.exe</GenAPIPath>
167-
</PropertyGroup>
168-
169-
<ItemGroup>
170-
@foreach (var dep in @Model.NuGetDependencies)
171-
{
172-
if (dep.IsProjectReference)
173-
{
174-
<GenAPIItemBase
175-
Include="../../generated/@(dep.MavenArtifact.MavenGroupId).@(dep.MavenArtifact.MavenArtifactId)/"
176-
>
177-
<GenAPIAssembly>"$(IntermediateOutputPath)/@(dep.NuGetPackageId).dll"</GenAPIAssembly>
178-
<GenAPICSCode>./Additions/@(dep.NuGetPackageId).cs</GenAPICSCode>
179-
</GenAPIItemBase>
180-
}
181-
}
182-
</ItemGroup>
183-
184-
<Message Text=" GenAPIItemBase = %(GenAPIItemBase.Identity) %0A %(GenAPIItemBase.GenAPICSCode) %0A %(GenAPIItemBase.GenAPIAssembly)"></Message>
185-
<!--
186-
// For some reason GenAPI.exe can't handle absolute paths on mac/unix properly, so always make them relative
187-
// GenAPI.exe -libPath:$(MONOANDROID) -out:Some.generated.cs -w:TypeForwards ./relative/path/to/Assembly.dll
188-
-->
189-
<MakeDir Directories="./Additions" />
190-
<Exec
191-
Command="mono $(GenAPIPath) -libPath:$(MONOANDROID) -out:%(GenAPIItemBase.GenAPICSCode) -w:TypeForwards %(GenAPIItemBase.Identity)/%(GenAPIItemBase.GenAPIAssembly) "
192-
/>
193-
</Target>
194-
}
195-
196162
<ItemGroup>
197163
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
198164
</ItemGroup>

‎source/androidx.annotation/annotation/merge.targets‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

4-
<UsingTask
5-
AssemblyFile="Xamarin.Android.Support.BuildTasks.dll"
6-
TaskName="Xamarin.Android.Support.BuildTasks.VerifyVersionsTask" />
4+
<!-- This task doesn't do anything really right now, but we might use it again in the future -->
5+
<!-- <UsingTask
6+
AssemblyFile="Xamarin.AndroidX.Annotation.BuildTasks.dll"
7+
TaskName="Xamarin.AndroidX.Annotation.BuildTasks.VerifyVersionsTask" />
78
89
<Target
9-
Name="_VerifyXamarinAndroidSupportVersions"
10+
Name="_VerifyXamarinAndroidXVersions"
1011
AfterTargets="ResolveAssemblyReferences">
1112
1213
<VerifyVersionsTask
@@ -18,6 +19,6 @@
1819
>
1920
</VerifyVersionsTask>
2021
21-
</Target>
22+
</Target> -->
2223

2324
</Project>

‎source/androidx.vectordrawable/vectordrawable/merge.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
-->
88
<PropertyGroup>
9-
<VectorDrawableCheckBuildToolsVersionTaskFilename Condition=" '$(VectorDrawableCheckBuildToolsVersionTaskFilename)' == '' ">$(MSBuildThisFileDirectory)Xamarin.Android.Support.Tasks.VectorDrawable.dll</VectorDrawableCheckBuildToolsVersionTaskFilename>
9+
<VectorDrawableCheckBuildToolsVersionTaskFilename Condition=" '$(VectorDrawableCheckBuildToolsVersionTaskFilename)' == '' ">$(MSBuildThisFileDirectory)Xamarin.AndroidX.VectorDrawable.BuildTasks.dll</VectorDrawableCheckBuildToolsVersionTaskFilename>
1010
</PropertyGroup>
1111

1212
<!-- set some defaults -->
@@ -22,7 +22,7 @@
2222
<!-- include the task assembly -->
2323
<UsingTask
2424
AssemblyFile="$(VectorDrawableCheckBuildToolsVersionTaskFilename)"
25-
TaskName="Xamarin.Android.Support.Tasks.VectorDrawableCheckBuildToolsVersionTask" />
25+
TaskName="Xamarin.AndroidX.VectorDrawable.BuildTasks.VectorDrawableCheckBuildToolsVersionTask" />
2626

2727
<!-- the build tasks -->
2828
<Target

source/buildtasks/support-annotations-tests/Support-Annotations-BuildTasks-Tests.csproj renamed to source/buildtasks/annotation-tests/Annotation-BuildTasks-Tests.csproj

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" />
4-
<Import Project="..\..\packages\xunit.core.2.4.0\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" />
5-
<PropertyGroup>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{9A8F8560-6F80-4FCD-8F8E-CEA80FE12F45}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<RootNamespace>buildtasks.tests</RootNamespace>
11-
<AssemblyName>buildtasks.tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
13-
</PropertyGroup>
14-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
15-
<DebugSymbols>true</DebugSymbols>
16-
<DebugType>full</DebugType>
17-
<Optimize>false</Optimize>
18-
<OutputPath>bin\Debug</OutputPath>
19-
<DefineConstants>DEBUG;</DefineConstants>
20-
<ErrorReport>prompt</ErrorReport>
21-
<WarningLevel>4</WarningLevel>
22-
<ConsolePause>false</ConsolePause>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<Optimize>true</Optimize>
26-
<OutputPath>bin\Release</OutputPath>
27-
<ErrorReport>prompt</ErrorReport>
28-
<WarningLevel>4</WarningLevel>
29-
<ConsolePause>false</ConsolePause>
30-
</PropertyGroup>
31-
<ItemGroup>
32-
<PackageReference Include="xunit" Version="2.4.0" />
33-
<PackageReference Include="xunit.runner.visualstudio" version="2.4.0" />
34-
</ItemGroup>
35-
<ItemGroup>
36-
<Reference Include="System" />
37-
<Reference Include="Microsoft.Build.Utilities.v4.0" />
38-
<Reference Include="System.Runtime.Serialization">
39-
<HintPath>..\..\..\..\..\..\Library\Frameworks\Mono.framework\Versions\5.12.0\lib\mono\4.5-api\System.Runtime.Serialization.dll</HintPath>
40-
</Reference>
41-
<Reference Include="System.Xml" />
42-
<Reference Include="System.Web.Extensions">
43-
<HintPath>..\..\..\..\..\..\Library\Frameworks\Mono.framework\Versions\5.12.0\lib\mono\4.5-api\System.Web.Extensions.dll</HintPath>
44-
</Reference>
45-
<Reference Include="Microsoft.CSharp" />
46-
</ItemGroup>
47-
<ItemGroup>
48-
<Compile Include="Properties\AssemblyInfo.cs" />
49-
<Compile Include="Tests.cs" />
50-
</ItemGroup>
51-
<ItemGroup>
52-
<None Include="TestData\project.assets.json">
53-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
54-
</None>
55-
</ItemGroup>
56-
<ItemGroup>
57-
<Folder Include="TestData\" />
58-
</ItemGroup>
59-
<ItemGroup>
60-
<ProjectReference Include="..\support-annotations\Support-Annotations-BuildTasks.csproj">
61-
<Project>{21CE9566-FE09-4FEA-BE0F-4864083CD9D1}</Project>
62-
<Name>Support-Annotations-BuildTasks</Name>
63-
</ProjectReference>
64-
</ItemGroup>
65-
<Target Name="Pack">
66-
</Target>
67-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" />
4+
<Import Project="..\..\packages\xunit.core.2.4.0\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" />
5+
<PropertyGroup>
6+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8+
<ProjectGuid>{9A8F8560-6F80-4FCD-8F8E-CEA80FE12F45}</ProjectGuid>
9+
<OutputType>Library</OutputType>
10+
<RootNamespace>buildtasks.tests</RootNamespace>
11+
<AssemblyName>buildtasks.tests</AssemblyName>
12+
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
13+
</PropertyGroup>
14+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
15+
<DebugSymbols>true</DebugSymbols>
16+
<DebugType>full</DebugType>
17+
<Optimize>false</Optimize>
18+
<OutputPath>bin\Debug</OutputPath>
19+
<DefineConstants>DEBUG;</DefineConstants>
20+
<ErrorReport>prompt</ErrorReport>
21+
<WarningLevel>4</WarningLevel>
22+
<ConsolePause>false</ConsolePause>
23+
</PropertyGroup>
24+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25+
<Optimize>true</Optimize>
26+
<OutputPath>bin\Release</OutputPath>
27+
<ErrorReport>prompt</ErrorReport>
28+
<WarningLevel>4</WarningLevel>
29+
<ConsolePause>false</ConsolePause>
30+
</PropertyGroup>
31+
<ItemGroup>
32+
<PackageReference Include="xunit" Version="2.4.0" />
33+
<PackageReference Include="xunit.runner.visualstudio" version="2.4.0" />
34+
</ItemGroup>
35+
<ItemGroup>
36+
<Reference Include="System" />
37+
<Reference Include="Microsoft.Build.Utilities.v4.0" />
38+
<Reference Include="System.Runtime.Serialization">
39+
<HintPath>..\..\..\..\..\..\Library\Frameworks\Mono.framework\Versions\5.12.0\lib\mono\4.5-api\System.Runtime.Serialization.dll</HintPath>
40+
</Reference>
41+
<Reference Include="System.Xml" />
42+
<Reference Include="System.Web.Extensions">
43+
<HintPath>..\..\..\..\..\..\Library\Frameworks\Mono.framework\Versions\5.12.0\lib\mono\4.5-api\System.Web.Extensions.dll</HintPath>
44+
</Reference>
45+
<Reference Include="Microsoft.CSharp" />
46+
</ItemGroup>
47+
<ItemGroup>
48+
<Compile Include="Properties\AssemblyInfo.cs" />
49+
<Compile Include="Tests.cs" />
50+
</ItemGroup>
51+
<ItemGroup>
52+
<None Include="TestData\project.assets.json">
53+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
54+
</None>
55+
</ItemGroup>
56+
<ItemGroup>
57+
<Folder Include="TestData\" />
58+
</ItemGroup>
59+
<ItemGroup>
60+
<ProjectReference Include="..\annotations\Annotation-BuildTasks.csproj">
61+
<Project>{21CE9566-FE09-4FEA-BE0F-4864083CD9D1}</Project>
62+
<Name>Annotation-BuildTasks</Name>
63+
</ProjectReference>
64+
</ItemGroup>
65+
<Target Name="Pack">
66+
</Target>
67+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
6868
</Project>

source/buildtasks/support-annotations-tests/Properties/AssemblyInfo.cs renamed to source/buildtasks/annotation-tests/Properties/AssemblyInfo.cs

File renamed without changes.

source/buildtasks/support-annotations-tests/TestData/project.assets.json renamed to source/buildtasks/annotation-tests/TestData/project.assets.json

File renamed without changes.

source/buildtasks/support-annotations-tests/Tests.cs renamed to source/buildtasks/annotation-tests/Tests.cs

File renamed without changes.

source/buildtasks/support-annotations/Support-Annotations-BuildTasks.csproj renamed to source/buildtasks/annotations/Annotation-BuildTasks.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProjectGuid>{21CE9566-FE09-4FEA-BE0F-4864083CD9D1}</ProjectGuid>
77
<OutputType>Library</OutputType>
8-
<RootNamespace>Xamarin.Android.Support.BuildTasks</RootNamespace>
9-
<AssemblyName>Xamarin.Android.Support.BuildTasks</AssemblyName>
8+
<RootNamespace>Xamarin.AndroidX.Annotation.BuildTasks</RootNamespace>
9+
<AssemblyName>Xamarin.AndroidX.Annotation.BuildTasks</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1111
</PropertyGroup>
1212
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

source/buildtasks/support-annotations/Models/ProjectAssets.cs renamed to source/buildtasks/annotations/Models/ProjectAssets.cs

File renamed without changes.

0 commit comments

Comments
 (0)