forked from dotnet/android-tools
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update to sdk-style csproj and netstandard2.0. (dotnet#78)
Update `Xamarin.Android.Tools.AndroidSdk` to use sdk-style projects and target frameworks `netstandard2.0` and `net461`. Update `Xamarin.Android.Tools.AndroidSdk-Tests` to use sdk-style projects. Move `Xamarin.Android.Tools.AndroidSdk-Tests` into a `tests` directory to avoid sdk-style globbing. Use MSBuild properties for NuGet packages instead of .nuspec. Update `MicroBuild.Core` to `Microsoft.VisualStudioEng.MicroBuild.Core`. * Not sure what this does but [the docs][0] said the old one was deprecated and pointed to the new one which supports `netstandard2.0`. [0]: https://www.nuget.org/packages/MicroBuild.Core
- Loading branch information
Showing
15 changed files
with
74 additions
and
192 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 0 additions & 15 deletions
15
src/Xamarin.Android.Tools.AndroidSdk/Properties/AssemblyInfo.cs
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
src/Xamarin.Android.Tools.AndroidSdk/Tests/Properties/AssemblyInfo.cs
This file was deleted.
Oops, something went wrong.
71 changes: 0 additions & 71 deletions
71
src/Xamarin.Android.Tools.AndroidSdk/Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
src/Xamarin.Android.Tools.AndroidSdk/Tests/packages.config
This file was deleted.
Oops, something went wrong.
71 changes: 19 additions & 52 deletions
71
src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,70 +1,37 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
|
||
<PropertyGroup> | ||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
<ProjectGuid>{e34bcfa0-caa4-412c-aa1c-75db8d67d157}</ProjectGuid> | ||
<OutputType>Library</OutputType> | ||
<RootNamespace>Xamarin.Android.Tools</RootNamespace> | ||
<AssemblyName>Xamarin.Android.Tools.AndroidSdk</AssemblyName> | ||
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> | ||
<ProductVersion>8.0.30703</ProductVersion> | ||
<SchemaVersion>2.0</SchemaVersion> | ||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks> | ||
<SignAssembly>true</SignAssembly> | ||
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile> | ||
<Title>Xamarin.Android.Tools</Title> | ||
<Authors>Xamarin</Authors> | ||
<PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
<PackageProjectUrl>https://github.com/xamarin/xamarin-android-tools</PackageProjectUrl> | ||
<Description>Xamarin tools for interacting with the Android SDK.</Description> | ||
<Copyright>Copyright © Xamarin 2011-2016</Copyright> | ||
<PackageTags>Xamarin;Xamarin.Android</PackageTags> | ||
</PropertyGroup> | ||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
<DebugSymbols>true</DebugSymbols> | ||
<DebugType>full</DebugType> | ||
<Optimize>false</Optimize> | ||
|
||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
<OutputPath>..\..\bin\Debug</OutputPath> | ||
<DefineConstants>DEBUG;</DefineConstants> | ||
<ErrorReport>prompt</ErrorReport> | ||
<WarningLevel>4</WarningLevel> | ||
<ConsolePause>false</ConsolePause> | ||
</PropertyGroup> | ||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
<DebugType>full</DebugType> | ||
<Optimize>true</Optimize> | ||
|
||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> | ||
<OutputPath>..\..\bin\Release</OutputPath> | ||
<ErrorReport>prompt</ErrorReport> | ||
<WarningLevel>4</WarningLevel> | ||
<ConsolePause>false</ConsolePause> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="MicroBuild.Core"> | ||
<Version>0.3.0</Version> | ||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> | ||
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="0.4.1"> | ||
<PrivateAssets>all</PrivateAssets> | ||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> | ||
</PackageReference> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<FilesToSign Include="$(OutDir)\Xamarin.Android.Tools.AndroidSdk.dll"> | ||
<Authenticode>Microsoft400</Authenticode> | ||
</FilesToSign> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<Reference Include="System" /> | ||
<Reference Include="System.Xml" /> | ||
<Reference Include="System.Xml.Linq" /> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<Compile Include="Properties\AssemblyInfo.cs" /> | ||
<Compile Include="AndroidTargetArch.cs" /> | ||
<Compile Include="OS.cs" /> | ||
<Compile Include="AndroidVersion.cs" /> | ||
<Compile Include="AndroidVersions.cs" /> | ||
<Compile Include="AndroidSdkInfo.cs" /> | ||
<Compile Include="JdkInfo.cs" /> | ||
<Compile Include="Sdks\AndroidSdkBase.cs" /> | ||
<Compile Include="Sdks\AndroidSdkUnix.cs" /> | ||
<Compile Include="Sdks\AndroidSdkWindows.cs" /> | ||
<Compile Include="ProcessUtils.cs" /> | ||
<Compile Include="AndroidAppManifest.cs" /> | ||
<Compile Include="FileUtil.cs" /> | ||
</ItemGroup> | ||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||
<ItemGroup> | ||
<Folder Include="Sdks\" /> | ||
</ItemGroup> | ||
|
||
</Project> |
16 changes: 0 additions & 16 deletions
16
src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.nuspec
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
34 changes: 34 additions & 0 deletions
34
tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>net461</TargetFramework> | ||
<IsPackable>false</IsPackable> | ||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> | ||
</PropertyGroup> | ||
|
||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
<OutputPath>..\..\bin\TestDebug</OutputPath> | ||
</PropertyGroup> | ||
|
||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> | ||
<OutputPath>..\..\bin\TestRelease</OutputPath> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="nunit" Version="3.11.0" /> | ||
<PackageReference Include="NUnit.ConsoleRunner" Version="3.9.0" /> | ||
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" /> | ||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<EmbeddedResource Include="Resources\manifest-simplewidget.xml"> | ||
<LogicalName>manifest-simplewidget.xml</LogicalName> | ||
</EmbeddedResource> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<ProjectReference Include="..\..\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj" /> | ||
</ItemGroup> | ||
|
||
</Project> |