Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 0 additions & 24 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,30 +109,6 @@
"$msCompile"
]
},
{
"label": "build-sample",
"type": "shell",
"command": "bin/${input:configuration}/bin/xabuild ${input:project} /t:${input:target} /p:Configuration=${input:configuration}",
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": [
"$msCompile"
]
},
{
"label": "run-sample",
"type": "shell",
"command": "bin/${input:configuration}/bin/xabuild ${input:project} /restore \"/t:Install;_Run\" /p:AndroidAttachDebugger=${input:attach} /p:Configuration=${input:configuration}",
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": [
"$msCompile"
]
},
{
"label": "prepare-sample-under-dotnet",
"type": "shell",
Expand Down
2 changes: 0 additions & 2 deletions Documentation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
# Development Workflow

* [How to add support for a new Android API level](workflow/HowToAddNewApiLevel.md)
* [Using Your Build](workflow/UsingYourBuild.md)
* [OSS Build Artifacts](workflow/OSSBuildArtifacts.md)
* [Development tips and native debugging](workflow/DevelopmentTips.md)
* [Localization](workflow/Localization.md)
* [Custom system properties](workflow/SystemProperties.md)
Expand Down
22 changes: 2 additions & 20 deletions Documentation/building/unix/instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,6 @@ Several `.nupkg` files will be output in `./bin/Build$(Configuration)/nuget-unsi
Commercial installers will be created by this command if the
`make prepare-external-git-dependencies` command was ran before building.

# Building Unit Tests

Once `make all` or `make jenkins` have completed, the unit tests may
be built with:

make all-tests


# Running Unit Tests

Expand Down Expand Up @@ -199,13 +192,6 @@ All `.apk`-based unit test projects provide the following targets:
To run an individual `.apk`-based test project, a package must be built, using the
`SignAndroidPackage` target, installed, and executed.

For example:

$ bin/Debug/bin/xabuild /t:SignAndroidPackage tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.csproj
$ bin/Debug/bin/xabuild /t:DeployTestApks tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.csproj
$ bin/Debug/bin/xabuild /t:RunTestApks tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.csproj


## Running `.apk` Projects with Include/Exclude

If an `.apk`-based unit test uses the NUnit `[Category]` custom attribute, then
Expand All @@ -227,11 +213,7 @@ A single NUnit *Test Fixture* -- a class with the `[TestFixture]`
custom attribute -- may be executed instead of executing *all* test fixtures.

The `RunTestApks` target accepts a `TestFixture` MSBuild property
to specify the test fixture class to execute:

$ bin/Debug/bin/xabuild /t:RunTestApks \
/p:TestFixture=Xamarin.Android.LocaleTests.SatelliteAssemblyTests \
tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.csproj
to specify the test fixture class to execute.

If using `Xamarin.Android.NUnitLite` for projects outside the `xamarin-android`
repository, such as NUnit tests for a custom app, the `RunTestApks` target
Expand Down Expand Up @@ -360,7 +342,7 @@ where the "relevant directory" is the target of interest within
`src/mono-runtimes/obj/$(Configuration)`. When `make` has completed,
invoke the `_InstallRuntimes` target so that the updated native libraries
are copied into `bin/$(Configuration)/lib`, which will allow subsequent
top-level `make` and [`xabuild`](../../../tools/xabuild) invocations to use them.
top-level `make` invocations to use them.

For example, to rebuild Mono for armeabi-v7a:

Expand Down
21 changes: 3 additions & 18 deletions Documentation/building/windows/instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,9 @@ MSBuild version 15 or later is required.

This will clone and build external proprietary components such as `monodroid`.

After the solution has built successfully, you can [use your
build][using-your-build] to build Xamarin.Android application and library
projects. Note that by default `Xamarin.Android.sln` only builds support for
the `$(TargetFrameworkVersion)` specified in the `$(AndroidFrameworkVersion)`
property of the [`Configuration.props`][configprops-main] file (`v12.0` when
this guide was last updated), so you will need to ensure that your application
and library projects are configured to use that particular target framework
version.
After the solution has built successfully, you can use `dotnet-local.cmd` to create and build Android projects.

[developer-prompt]: https://docs.microsoft.com/dotnet/framework/tools/developer-command-prompt-for-vs
[using-your-build]: https://github.com/xamarin/xamarin-android/blob/main/Documentation/workflow/UsingYourBuild.md
[configprops-main]: https://github.com/xamarin/xamarin-android/blob/main/Configuration.props

## Windows Build Notes
Expand Down Expand Up @@ -141,10 +133,10 @@ command was ran before building.

# Building Unit Tests

Once `msbuild Xamarin.Android.sln` has completed, the unit tests may
Once `dotnet msbuild Xamarin.Android.sln` has completed, the unit tests may
be built with e.g.:

bin\Debug\bin\xabuild.exe Xamarin.Android-Tests.sln /restore /p:Configuration=Debug /bl:bin\TestDebug\msbuild-build-tests.binlog
dotnet-local.cmd build Xamarin.Android-Tests.sln /restore /p:Configuration=Debug /bl:bin\TestDebug\msbuild-build-tests.binlog

Note that the `Debug` in `bin\Debug` must match the Configuration which was
built. If xamarin-android was built with `msbuild /p:Configuration=Release ...`,
Expand Down Expand Up @@ -193,13 +185,6 @@ All `.apk`-based unit test projects provide the following targets:
To run an individual `.apk`-based test project, a package must be built, using the
`SignAndroidPackage` target, installed, and executed.

For example:

$ bin/Debug/bin/xabuild /t:SignAndroidPackage tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.csproj
$ bin/Debug/bin/xabuild /t:DeployTestApks tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.csproj
$ bin/Debug/bin/xabuild /t:RunTestApks tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.csproj


## Running `.apk` Projects with Include/Exclude

If an `.apk`-based unit test uses the NUnit `[Category]` custom attribute, then
Expand Down
2 changes: 0 additions & 2 deletions Documentation/project-docs/ExploringSources.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ is used within many of the output directories which are created.
* `Xamarin.Android.Tools.BootstrapTasks`: supplemental build tasks used by
some build-tools. (This should be in `build-tools`; oops.)
* `tools`: Utilities which are built into `bin/$(Configuration)`.
* `xabuild`: MSBuild "wrapper" to easily build Xamarin.Android projects without
requiring system-wide installation of Xamarin.Android

<a name="tfv" />

Expand Down
188 changes: 0 additions & 188 deletions Documentation/workflow/OSSBuildArtifacts.md

This file was deleted.

Loading