Skip to content

Commit 1c09dcc

Browse files
authored
Update README.md and build scripts (#238)
1 parent 2606225 commit 1c09dcc

File tree

7 files changed

+26
-40
lines changed

7 files changed

+26
-40
lines changed

CODE-OF-CONDUCT.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Code of Conduct
2+
3+
This project has adopted the code of conduct defined by the Contributor Covenant
4+
to clarify expected behavior in our community.
5+
6+
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

LICENSE

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
xamarin-android-tools
2-
31
The MIT License (MIT)
42

53
Copyright (c) .NET Foundation Contributors

Makefile

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ V ?= 0
55
include build-tools/scripts/msbuild.mk
66

77
all:
8-
$(MSBUILD) /restore $(MSBUILD_FLAGS) Xamarin.Android.Tools.sln
8+
$(MSBUILD) $(MSBUILD_FLAGS) Xamarin.Android.Tools.sln
99

1010
clean:
1111
-$(MSBUILD) $(MSBUILD_FLAGS) /t:Clean Xamarin.Android.Tools.sln
1212

13-
prepare:
14-
nuget restore Xamarin.Android.Tools.sln
15-
1613
run-all-tests:
1714
dotnet test -l "console;verbosity=detailed" -l trx \
1815
tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj

README.md

+11-24
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# xamarin-android-tools
1+
# android-tools
22

3-
**xamarin-android-tools** is a repo to easily share code between the
4-
[xamarin-android][x-a] repo and the Xamarin.Android commercial tooling,
3+
**android-tools** is a repo to easily share code between the
4+
[xamarin-android][android] repo and the .NET for Android commercial tooling,
55
such as IDE extensions, without requiring that the IDE extensions
6-
submodule the entire **xamarin-android** repo, which is gigantic.
6+
submodule the entire **android** repo, which is gigantic.
77

8-
[x-a]: https://github.com/xamarin/xamarin-android
8+
[android]: https://github.com/xamarin/xamarin-android
99

1010
# Build Status
1111

@@ -23,7 +23,7 @@ submodule the entire **xamarin-android** repo, which is gigantic.
2323

2424
# Build Requirements
2525

26-
**xamarin-android-tools** requires Mono 4.8 or later and `nuget`.
26+
**-android-tools** requires .NET 6 or later.
2727

2828
# Build Configuration
2929

@@ -38,18 +38,11 @@ The default `make all` target accepts the following optional
3838

3939
# Build
4040

41-
To build **xamarin-android-tools**:
41+
To build **android-tools**:
4242

43-
msbuild /restore Xamarin.Android.Tools.sln
43+
dotnet build Xamarin.Android.Tools.sln
4444

45-
Alternatively, first prepare the project:
46-
47-
make prepare
48-
49-
This will perform `nuget restore` and any other pre-build tasks
50-
that need to be performed.
51-
52-
Next, run `make`:
45+
Alternatively run `make`:
5346

5447
make
5548

@@ -71,19 +64,13 @@ e.g. `bin\TestDebug`, contains unit tests and related files.
7164
* `bin\$(Configuration)`: redistributable build artifacts.
7265
* `bin\Test$(Configuration)`: Unit tests and related files.
7366

74-
# Contributing
67+
# Distribution
7568

7669
Package versioning follows [Semantic Versioning 2.0.0](https://semver.org/).
7770
The major version in the `nuget.version` file should be updated when a breaking change is introduced.
7871
The minor version should be updated when new functionality is added.
7972
The patch version will be automatically determined by the number of commits since the last version change.
8073

81-
This project has adopted the code of conduct defined by the Contributor Covenant
82-
to clarify expected behavior in our community. For more information, see the
83-
[.NET Foundation Code of Conduct](http://www.dotnetfoundation.org/code-of-conduct).
84-
85-
# Distribution
86-
8774
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).
8875
To download one of these packages, navigate to the build you are interested in and click on the `Artifacts` button.
8976

@@ -111,4 +98,4 @@ We use [Mono's Coding Guidelines](http://www.mono-project.com/community/contribu
11198

11299
# Reporting Bugs
113100

114-
We use [GitHub](https://github.com/xamarin/xamarin-android-tools/issues) to track issues.
101+
We use [GitHub](https://github.com/dotnet/android-tools/issues) to track issues.

azure-pipelines.yaml

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
name: Xamarin.Android.Tools $(Rev:r)
1+
name: Android.Tools $(Rev:r)
22

33
trigger:
4-
- main
5-
- d16-*
6-
- d17-*
4+
- main
5+
- release/*
76

87
pr:
9-
- main
10-
- d16-*
11-
- d17-*
8+
- main
9+
- release/*
1210

1311
parameters:
1412
- name: ApiScanSourceBranch

build-tools/scripts/msbuild.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# $(MSBUILD): The MSBuild program to use. Defaults to `xbuild` unless overridden.
2323
# $(MSBUILD_FLAGS): Additional MSBuild flags; contains $(CONFIGURATION), $(V), $(MSBUILD_ARGS).
2424

25-
MSBUILD = msbuild
25+
MSBUILD = dotnet build
2626
MSBUILD_FLAGS = /p:Configuration=$(CONFIGURATION) $(MSBUILD_ARGS)
2727

2828
ifeq ($(OS),Darwin)
@@ -35,7 +35,7 @@ ifneq ($(V),0)
3535
MSBUILD_FLAGS += /v:diag
3636
endif # $(V) != 0
3737

38-
ifeq ($(MSBUILD),msbuild)
38+
ifeq ($(MSBUILD),dotnet build)
3939
USE_MSBUILD = 1
4040
endif # $(MSBUILD) == msbuild
4141

src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Title>Xamarin.Android.Tools</Title>
1111
<Authors>Xamarin</Authors>
1212
<PackageLicenseExpression>MIT</PackageLicenseExpression>
13-
<PackageProjectUrl>https://github.com/xamarin/xamarin-android-tools</PackageProjectUrl>
13+
<PackageProjectUrl>https://github.com/dotnet/android-tools</PackageProjectUrl>
1414
<Description>Xamarin tools for interacting with the Android SDK.</Description>
1515
<Copyright>Copyright © Xamarin 2011-2016</Copyright>
1616
<PackageTags>Xamarin;Xamarin.Android</PackageTags>

0 commit comments

Comments
 (0)