diff --git a/CODE-OF-CONDUCT.md b/CODE-OF-CONDUCT.md new file mode 100644 index 00000000..775f221c --- /dev/null +++ b/CODE-OF-CONDUCT.md @@ -0,0 +1,6 @@ +# Code of Conduct + +This project has adopted the code of conduct defined by the Contributor Covenant +to clarify expected behavior in our community. + +For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct). diff --git a/LICENSE b/LICENSE index e5d11ed6..67f20e2e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,3 @@ -xamarin-android-tools - The MIT License (MIT) Copyright (c) .NET Foundation Contributors diff --git a/Makefile b/Makefile index f9af94f9..865b0311 100644 --- a/Makefile +++ b/Makefile @@ -5,14 +5,11 @@ V ?= 0 include build-tools/scripts/msbuild.mk all: - $(MSBUILD) /restore $(MSBUILD_FLAGS) Xamarin.Android.Tools.sln + $(MSBUILD) $(MSBUILD_FLAGS) Xamarin.Android.Tools.sln clean: -$(MSBUILD) $(MSBUILD_FLAGS) /t:Clean Xamarin.Android.Tools.sln -prepare: - nuget restore Xamarin.Android.Tools.sln - run-all-tests: dotnet test -l "console;verbosity=detailed" -l trx \ tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj diff --git a/README.md b/README.md index 92720c90..fb3bf39c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# xamarin-android-tools +# android-tools -**xamarin-android-tools** is a repo to easily share code between the -[xamarin-android][x-a] repo and the Xamarin.Android commercial tooling, +**android-tools** is a repo to easily share code between the +[xamarin-android][android] repo and the .NET for Android commercial tooling, such as IDE extensions, without requiring that the IDE extensions -submodule the entire **xamarin-android** repo, which is gigantic. +submodule the entire **android** repo, which is gigantic. -[x-a]: https://github.com/xamarin/xamarin-android +[android]: https://github.com/xamarin/xamarin-android # Build Status @@ -23,7 +23,7 @@ submodule the entire **xamarin-android** repo, which is gigantic. # Build Requirements -**xamarin-android-tools** requires Mono 4.8 or later and `nuget`. +**-android-tools** requires .NET 6 or later. # Build Configuration @@ -38,18 +38,11 @@ The default `make all` target accepts the following optional # Build -To build **xamarin-android-tools**: +To build **android-tools**: - msbuild /restore Xamarin.Android.Tools.sln + dotnet build Xamarin.Android.Tools.sln -Alternatively, first prepare the project: - - make prepare - -This will perform `nuget restore` and any other pre-build tasks -that need to be performed. - -Next, run `make`: +Alternatively run `make`: make @@ -71,19 +64,13 @@ e.g. `bin\TestDebug`, contains unit tests and related files. * `bin\$(Configuration)`: redistributable build artifacts. * `bin\Test$(Configuration)`: Unit tests and related files. -# Contributing +# Distribution Package versioning follows [Semantic Versioning 2.0.0](https://semver.org/). The major version in the `nuget.version` file should be updated when a breaking change is introduced. The minor version should be updated when new functionality is added. The patch version will be automatically determined by the number of commits since the last version change. -This project has adopted the code of conduct defined by the Contributor Covenant -to clarify expected behavior in our community. For more information, see the -[.NET Foundation Code of Conduct](http://www.dotnetfoundation.org/code-of-conduct). - -# Distribution - Xamarin.Android.Tools.AndroidSdk nupkg files are produced for every build which occurrs on [Azure Devops](https://dev.azure.com/xamarin/Xamarin/_build?definitionId=2&_a=summary). To download one of these packages, navigate to the build you are interested in and click on the `Artifacts` button. @@ -111,4 +98,4 @@ We use [Mono's Coding Guidelines](http://www.mono-project.com/community/contribu # Reporting Bugs -We use [GitHub](https://github.com/xamarin/xamarin-android-tools/issues) to track issues. +We use [GitHub](https://github.com/dotnet/android-tools/issues) to track issues. diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index e8872f9b..46eb96ec 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -1,14 +1,12 @@ -name: Xamarin.Android.Tools $(Rev:r) +name: Android.Tools $(Rev:r) trigger: - - main - - d16-* - - d17-* +- main +- release/* pr: - - main - - d16-* - - d17-* +- main +- release/* parameters: - name: ApiScanSourceBranch diff --git a/build-tools/scripts/msbuild.mk b/build-tools/scripts/msbuild.mk index 54adf86d..6201e263 100644 --- a/build-tools/scripts/msbuild.mk +++ b/build-tools/scripts/msbuild.mk @@ -22,7 +22,7 @@ # $(MSBUILD): The MSBuild program to use. Defaults to `xbuild` unless overridden. # $(MSBUILD_FLAGS): Additional MSBuild flags; contains $(CONFIGURATION), $(V), $(MSBUILD_ARGS). -MSBUILD = msbuild +MSBUILD = dotnet build MSBUILD_FLAGS = /p:Configuration=$(CONFIGURATION) $(MSBUILD_ARGS) ifeq ($(OS),Darwin) @@ -35,7 +35,7 @@ ifneq ($(V),0) MSBUILD_FLAGS += /v:diag endif # $(V) != 0 -ifeq ($(MSBUILD),msbuild) +ifeq ($(MSBUILD),dotnet build) USE_MSBUILD = 1 endif # $(MSBUILD) == msbuild 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 d37e9cb6..ffaf31cd 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj +++ b/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj @@ -10,7 +10,7 @@ Xamarin.Android.Tools Xamarin MIT - https://github.com/xamarin/xamarin-android-tools + https://github.com/dotnet/android-tools Xamarin tools for interacting with the Android SDK. Copyright © Xamarin 2011-2016 Xamarin;Xamarin.Android