diff --git a/Xamarin.Android.Tools.sln b/Xamarin.Android.Tools.sln index 7fbff60..c7e13b7 100644 --- a/Xamarin.Android.Tools.sln +++ b/Xamarin.Android.Tools.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.AndroidSdk", "src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj", "{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.AndroidSdk-Tests", "src\Xamarin.Android.Tools.AndroidSdk\Tests\Xamarin.Android.Tools.AndroidSdk-Tests.csproj", "{1E5501E8-49C1-4659-838D-CC9720C5208F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.AndroidSdk-Tests", "tests\Xamarin.Android.Tools.AndroidSdk-Tests\Xamarin.Android.Tools.AndroidSdk-Tests.csproj", "{1E5501E8-49C1-4659-838D-CC9720C5208F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index 01db5bb..1db8f6c 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -1,11 +1,16 @@ name: Xamarin.Android.Tools $(Rev:r) + jobs: - job: windows displayName: windows pool: Hosted VS2017 steps: + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet' + inputs: + versionSpec: '5.4.x' - task: NuGetCommand@2 - displayName: 'NuGet restore' + displayName: 'NuGet Restore' inputs: restoreSolution: Xamarin.Android.Tools.sln - task: MSBuild@1 @@ -13,39 +18,43 @@ jobs: inputs: solution: Xamarin.Android.Tools.sln - task: VSTest@2 - displayName: 'VsTest - NUnit3' + displayName: 'Run Tests' inputs: testAssemblyVer2: 'bin\TestDebug\*-Tests.dll' - pathtoCustomTestAdapters: 'packages\NUnit3TestAdapter.3.13.0\build\net35' - powershell: | $hashOfLastVersionChange = & "git" "log" "--follow" "-1" "--pretty=%H" "nuget.version" $commitsSinceVersionChange = & "git" "rev-list" "--count" "$hashOfLastVersionChange..HEAD" $majorMinor = Get-Content "nuget.version" $version = "$majorMinor.$commitsSinceVersionChange" Write-Host "##vso[task.setvariable variable=xat.nuget.version]$version" - - task: NuGetCommand@2 - displayName: NuGet pack + - task: MSBuild@1 + displayName: 'Build NuGet' inputs: - command: custom - arguments: pack src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj -Version $(xat.nuget.version) -OutputDirectory $(Build.ArtifactStagingDirectory) + solution: 'src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj' + msbuildArguments: '/t:pack /p:Version=$(xat.nuget.version) /p:OutputPath=$(Build.ArtifactStagingDirectory)' - task: PublishBuildArtifacts@1 - displayName: upload artifacts + displayName: Upload Artifacts inputs: pathtoPublish: $(Build.ArtifactStagingDirectory) - job: mac displayName: mac pool: Hosted macOS steps: + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet' + inputs: + versionSpec: '5.4.x' - task: NuGetCommand@2 - displayName: 'NuGet restore' + displayName: 'NuGet Restore' inputs: restoreSolution: Xamarin.Android.Tools.sln + restoreDirectory: 'packages' - task: MSBuild@1 displayName: 'Build solution Xamarin.Android.Tools.sln' inputs: solution: Xamarin.Android.Tools.sln - - script: mono packages/NUnit.ConsoleRunner.3.9.0/tools/nunit3-console.exe bin/TestDebug/Xamarin.Android.Tools.AndroidSdk-Tests.dll - displayName: Run NUnit Tests + - script: mono packages/nunit.consolerunner/3.9.0/tools/nunit3-console.exe bin/TestDebug/Xamarin.Android.Tools.AndroidSdk-Tests.dll + displayName: Run Tests - task: PublishTestResults@2 condition: always() inputs: diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/AssemblyInfo.cs b/src/Xamarin.Android.Tools.AndroidSdk/Properties/AssemblyInfo.cs deleted file mode 100644 index 45dfcd0..0000000 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly: AssemblyTitle ("Xamarin.Android.Tools")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("Xamarin")] -[assembly: AssemblyProduct ("Xamarin.Android.Tools")] -[assembly: AssemblyCopyright ("Copyright © Xamarin 2011-2016")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] - -[assembly: AssemblyVersion ("1.0.0.0")] -[assembly: AssemblyFileVersion ("1.0.0.0")] - diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Tests/Properties/AssemblyInfo.cs b/src/Xamarin.Android.Tools.AndroidSdk/Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 3dfdbae..0000000 --- a/src/Xamarin.Android.Tools.AndroidSdk/Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyTitle("Xamarin.Android.Tools.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Xamarin.Android.Tools.Tests")] -[assembly: AssemblyCopyright("Copyright © Xamarin 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj b/src/Xamarin.Android.Tools.AndroidSdk/Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj deleted file mode 100644 index 58d66d2..0000000 --- a/src/Xamarin.Android.Tools.AndroidSdk/Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - Debug - AnyCPU - {1E5501E8-49C1-4659-838D-CC9720C5208F} - Library - Properties - Xamarin.Android.Tools.Tests - Xamarin.Android.Tools.AndroidSdk-Tests - v4.6 - 512 - - - true - full - false - ..\..\..\bin\TestDebug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\..\..\bin\TestRelease\ - TRACE - prompt - 4 - - - - ..\..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - - - - - - - - - - - - - - - - - - - - - {e34bcfa0-caa4-412c-aa1c-75db8d67d157} - Xamarin.Android.Tools.AndroidSdk - - - - - - - - manifest-simplewidget.xml - - - - diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Tests/packages.config b/src/Xamarin.Android.Tools.AndroidSdk/Tests/packages.config deleted file mode 100644 index 089d3ef..0000000 --- a/src/Xamarin.Android.Tools.AndroidSdk/Tests/packages.config +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj b/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj index 73f4555..0150bbc 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj +++ b/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj @@ -1,70 +1,37 @@ - - + + - Debug - AnyCPU - {e34bcfa0-caa4-412c-aa1c-75db8d67d157} - Library - Xamarin.Android.Tools - Xamarin.Android.Tools.AndroidSdk - v4.6 - 8.0.30703 - 2.0 + netstandard2.0;net461 true ..\..\product.snk + Xamarin.Android.Tools + Xamarin + MIT + https://github.com/xamarin/xamarin-android-tools + Xamarin tools for interacting with the Android SDK. + Copyright © Xamarin 2011-2016 + Xamarin;Xamarin.Android - - true - full - false + + ..\..\bin\Debug - DEBUG; - prompt - 4 - false - - full - true + + ..\..\bin\Release - prompt - 4 - false + - - 0.3.0 - runtime; build; native; contentfiles; analyzers + all + runtime; build; native; contentfiles; analyzers + Microsoft400 - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.nuspec b/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.nuspec deleted file mode 100644 index 85a4f9a..0000000 --- a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.nuspec +++ /dev/null @@ -1,16 +0,0 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - https://github.com/xamarin/xamarin-android-tools/blob/master/LICENSE - https://github.com/xamarin/xamarin-android-tools - false - Xamarin tools for interacting with the Android SDK. - $copyright$ - Xamarin Xamarin.Android - - \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Tests/AndroidAppManifestTests.cs b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidAppManifestTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.AndroidSdk/Tests/AndroidAppManifestTests.cs rename to tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidAppManifestTests.cs diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Tests/AndroidSdkInfoTests.cs b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidSdkInfoTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.AndroidSdk/Tests/AndroidSdkInfoTests.cs rename to tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidSdkInfoTests.cs diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Tests/AndroidVersionTests.cs b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidVersionTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.AndroidSdk/Tests/AndroidVersionTests.cs rename to tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidVersionTests.cs diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Tests/AndroidVersionsTests.cs b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidVersionsTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.AndroidSdk/Tests/AndroidVersionsTests.cs rename to tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidVersionsTests.cs diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Tests/JdkInfoTests.cs b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/JdkInfoTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.AndroidSdk/Tests/JdkInfoTests.cs rename to tests/Xamarin.Android.Tools.AndroidSdk-Tests/JdkInfoTests.cs diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Tests/Resources/manifest-simplewidget.xml b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/Resources/manifest-simplewidget.xml similarity index 100% rename from src/Xamarin.Android.Tools.AndroidSdk/Tests/Resources/manifest-simplewidget.xml rename to tests/Xamarin.Android.Tools.AndroidSdk-Tests/Resources/manifest-simplewidget.xml diff --git a/tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj new file mode 100644 index 0000000..b2de219 --- /dev/null +++ b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj @@ -0,0 +1,34 @@ + + + + net461 + false + false + + + + ..\..\bin\TestDebug + + + + ..\..\bin\TestRelease + + + + + + + + + + + + manifest-simplewidget.xml + + + + + + + +