Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit a3cc367

Browse files
moljacmoljac
authored
Merge branch 'master' into ReactiveX.RxKotlin
2 parents f3efc7c + f11966c commit a3cc367

File tree

71 files changed

+248
-3446
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+248
-3446
lines changed

‎.ci/build.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ parameters:
44
displayName: 'Build' # the human name of the job
55
timeoutInMinutes: 60 # the timeout in minutes
66
dependsOn: [] # any jobs this job depends on
7+
initSteps: [] # any steps to run before .NET global tools are installed
78
preBuildSteps: [] # any steps that need to run just before the main compilation starts
89
postBuildSteps: [] # any steps that need to run just after the main compilation ends
910
masterBranchName: 'master' # the "master" branch that should be used - can be something other than "master"
@@ -20,7 +21,7 @@ parameters:
2021
macosImage: 'macos-latest' # the name of the macOS VM image
2122
windowsImage: 'windows-latest' # the name of the Windows VM image
2223
mono: 'Latest' # the version of mono to use
23-
xcode: '12.2' # the version of Xcode to use
24+
xcode: '12.3' # the version of Xcode to use
2425
dotnet: '3.1.302' # the version of .NET Core to use
2526
cake: '0.38.4' # the version of Cake to use
2627
apiTools: '1.1.0-preview.1' # the version of the api-tools CLI to use
@@ -32,7 +33,7 @@ parameters:
3233
steps: [] # the steps to use when building, typically for 'none'
3334
verbosity: 'normal' # the build verbosity: 'minimal', 'normal', 'diagnostic'
3435
configuration: 'Release' # the build configuration: 'Debug', 'Release'
35-
validPackagePrefixes: [] # any NuGet prefixes that should pass validation (always includes Xamarin)
36+
validPackagePrefixes: [ 'Xamarin', 'Mono' ] # any NuGet prefixes that should pass validation
3637
artifactsPath: 'output' # the path to the NuGet packages that need to be signed, verified and published
3738
# basic cake build parameters
3839
cakeTarget: 'ci' # [basic] the Cake target to run (defaults to 'ci')
@@ -106,6 +107,9 @@ jobs:
106107
inputs:
107108
version: ${{ parameters.dotnet }}
108109
performMultiLevelLookup: true
110+
condition: ne('${{ parameters.dotnet }}', '')
111+
# custom init steps
112+
- ${{ parameters.initSteps }}
109113
- pwsh: |
110114
dotnet tool install -g api-tools --version ${{ parameters.apiTools }}
111115
dotnet tool install -g cake.tool --version ${{ parameters.cake }}

‎.ci/validation.cake‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ var ROOT_OUTPUT_DIR = ROOT_DIR.Combine ("output");
1212
var PACKAGE_NAMESPACES = Argument ("n", Argument ("namespaces", ""))
1313
.Split (new [] { ",", ";" }, StringSplitOptions.RemoveEmptyEntries)
1414
.ToList ();
15-
PACKAGE_NAMESPACES.AddRange (new [] {
16-
"Xamarin",
17-
"Mono",
18-
});
1915

2016

2117
// SECTION: Main Script

‎Android/ConstraintLayout/samples/NuGet.config‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<packageSources>
4-
<add key="BuildOutput" value="../output" />
5-
</packageSources>
3+
<packageSources>
4+
<clear />
5+
<add key="output-win" value="..\output" />
6+
<add key="output-mac" value="../output" />
7+
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
8+
</packageSources>
69
</configuration>

‎Android/Kotlin/samples/nuget.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4+
<clear />
45
<add key="output-win" value="..\output" />
56
<add key="output-mac" value="../output" />
7+
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
68
</packageSources>
79
</configuration>

‎Android/RenderScriptV8/samples/NuGet.config‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<packageSources>
4-
<add key="BuildOutput" value="../output" />
5-
</packageSources>
3+
<packageSources>
4+
<clear />
5+
<add key="output-win" value="..\output" />
6+
<add key="output-mac" value="../output" />
7+
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
8+
</packageSources>
69
</configuration>

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ After the externals are downloaded and built, the `.sln` files should compile in
8686

8787
---
8888

89-
## Xamarin Supported Open Source Components
89+
## Support & Getting Help
9090

91-
Xamarin Supported Open Source components are a collection of Xamarin built bindings and libraries.
91+
The following libraries are [supported](Support.md).
9292

9393
| Name | Description | Source |
9494
|---------------------------------------|----------------------------------------------------------------------------------|------------------------------------------------------------------|
@@ -98,6 +98,8 @@ Xamarin Supported Open Source components are a collection of Xamarin built bindi
9898
| Facebook SDK's | Bindings for Facebook's iOS & Android SDK's | [GitHub](https://github.com/xamarin/FacebookComponents) |
9999
| Xamarin.Auth | Cross-platform API for authenticating users and storing their accounts. | [GitHub](https://github.com/xamarin/Xamarin.Auth) |
100100

101+
To get help, visit the Xamarin area of [Microsoft Q&A](https://docs.microsoft.com/en-us/answers/products/dotnet).
102+
101103

102104
### Xamarin.Essentials
103105

‎SignList.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<FirstParty Include="Xamarin.*.dll" />
55
<FirstParty Include="Square.*.dll" />
66

7-
<!-- Kotlin -->
8-
<FirstParty Include="org.jetbrains.*.jar" />
7+
<!-- sign all the .jar files -->
8+
<FirstParty Include="*.jar" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎Support.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Support
2+
3+
## Xamarin Supported Open Source Components
4+
5+
Xamarin Supported Open Source components are a collection of Xamarin built bindings and libraries.
6+
7+
| Name | Description | Source |
8+
|---------------------------------------|----------------------------------------------------------------------------------|------------------------------------------------------------------|
9+
| Android Support Libraries | Bindings for Google's Android Support Libraries | [GitHub](https://github.com/xamarin/AndroidSupportComponents) |
10+
| Google Play Services Client Libraries | Bindings for Google's Play Services Client Libraries | [GitHub](https://github.com/xamarin/GooglePlayServicesComponents)|
11+
| Google API's for iOS | Bindings for Google's API's for iOS Libraries | [GitHub](https://github.com/xamarin/GoogleAPIsForiOSComponents) |
12+
| Facebook SDK's | Bindings for Facebook's iOS & Android SDK's | [GitHub](https://github.com/xamarin/FacebookComponents) |
13+
| Xamarin.Auth | Cross-platform API for authenticating users and storing their accounts. | [GitHub](https://github.com/xamarin/Xamarin.Auth) |
14+
15+
## How to file issues and get help
16+
17+
This project uses GitHub Issues to track bugs and feature requests. Please search the existing
18+
issues before filing new issues to avoid duplicates. For new issues, file your bug or
19+
feature request as a new Issue.
20+
21+
For help and questions about using these libraries, please ask questions on [Microsoft Q&A](https://docs.microsoft.com/en-us/answers/products/dotnet).
22+
23+
## Microsoft Support Policy
24+
25+
Support for the libraries hosted in this repository are limited to the resources listed above.

‎Util/AndroidManifestMerger/samples/nuget.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4+
<clear />
45
<add key="output-win" value="..\output" />
56
<add key="output-mac" value="../output" />
7+
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
68
</packageSources>
7-
</configuration>
9+
</configuration>

‎Util/VersionChecker/NuGet.config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)